From 7486272bd76a50b6d974c6f49604a8f71f16c311 Mon Sep 17 00:00:00 2001 From: Johannes Burk Date: Thu, 10 Jul 2014 20:20:54 +0200 Subject: [PATCH] Revert "Merge branch 'dev-lang' into develop" due to removed some needed strings by a mistake This reverts commit c171d1ee10b4ed6c3230369bcc551c0ad9ac0af9, reversing changes made to 5ed07122eaa2fcaeaa0d869f23ff4d82a52ff0b5. --- lang/de/enrol_apply.php | 42 +++++++++++++++----------------------- lang/es/enrol_apply.php | 17 +++++++-------- lang/pt_br/enrol_apply.php | 13 ++++++------ 3 files changed, 30 insertions(+), 42 deletions(-) diff --git a/lang/de/enrol_apply.php b/lang/de/enrol_apply.php index ee98f69..389e3db 100644 --- a/lang/de/enrol_apply.php +++ b/lang/de/enrol_apply.php @@ -1,25 +1,18 @@ {firstname}:Registrierungsname; {content}:Kursname'; -$string['cancelmailcontent_desc'] = 'Bitte benutzen Sie die Spezialmarkierungen, um den gewünschten Mailinhalt zu ersetzen.
{firstname}:Registrierungsname; {content}:Kursname'; +$string['confirmmailsubject'] = 'Bestätigung des Mail-Betreffs'; +$string['confirmmailcontent'] = 'Bestätigung des Mail-Inhalts'; +$string['cancelmailsubject'] = 'Löschen des Mail-Betreffs'; +$string['cancelmailcontent'] = 'Löschen des Mail-Inhalts'; +$string['mailaddress'] = 'Mailadresse senden'; +$string['mailusername'] = 'Mailbenutzernamen senden'; +$string['mailpassword'] = 'Mailpasswort senden'; +$string['confirmmailcontent_desc'] = 'Bitte benutzen Sie die Spezialmarkierungen, um den gewünschten Mailinhalt zu ersetzen.
{Vorname}:Registrierungsname; {Inhalt}:Kursname'; +$string['cancelmailcontent_desc'] = 'Bitte benutzen Sie die Spezialmarkierungen, um den gewünschten Mailinhalt zu ersetzen.
{Vorname}:Registrierungsname; {Inhalt}:Kursname'; $string['confirmusers'] = 'Einschreibung bestätigen'; @@ -29,22 +22,19 @@ $string['applyusermail'] = 'Email'; $string['applydate'] = 'Einschreibungsdatum'; $string['btnconfirm'] = 'Bestätigen'; $string['btncancel'] = 'Abbruch'; -$string['enrolusers'] = 'Benutzer manuell einschreiben'; +$string['enrolusers'] = 'Benutzer einschreiben'; $string['status'] = 'Bestätigung der Kurseinschreibung erlauben'; -$string['confirmenrol'] = 'Einschreibeanfragen bearbeiten'; +$string['confirmenrol'] = 'Anwendung verwalten'; $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'; -$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'; - +// 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['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 d583548..7943e31 100644 --- a/lang/es/enrol_apply.php +++ b/lang/es/enrol_apply.php @@ -12,12 +12,14 @@ // 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'; @@ -39,13 +41,8 @@ $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 145394c..0fa1cc9 100644 --- a/lang/pt_br/enrol_apply.php +++ b/lang/pt_br/enrol_apply.php @@ -12,12 +12,14 @@ // 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'; @@ -39,13 +41,12 @@ $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 +?>