From aebdf565bac2e1b255993f5094d11527e04e7dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Arag=C3=B3n?= Date: Fri, 12 Jul 2019 15:23:29 -0500 Subject: [PATCH 01/10] fix background install --- app/Resources/public/css/base.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 82304485db..a5f70a0073 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -37,7 +37,6 @@ } html { - background-color: #FFF; position: relative; min-height: 100%; } From b0548099aaaa11f938f033cd1a276d908bc6bbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Arag=C3=B3n?= Date: Tue, 3 Sep 2019 12:01:08 -0500 Subject: [PATCH 02/10] fix --- main/mySpace/access_details_session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/mySpace/access_details_session.php b/main/mySpace/access_details_session.php index e96d7918b2..aabf45006b 100644 --- a/main/mySpace/access_details_session.php +++ b/main/mySpace/access_details_session.php @@ -244,7 +244,7 @@ if ($form->validate()) { } } - $table = new HTML_Table(['class' => 'data_table_pdf']); + $table = new HTML_Table(['class' => 'data_table']); $headers = [ get_lang('MinStartDate'), get_lang('MaxEndDate'), From 0ccbd6aa9a3c0b9e51aa6ab09c822990c7c5c794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Arag=C3=B3n?= Date: Wed, 4 Sep 2019 00:08:00 -0500 Subject: [PATCH 03/10] password change enhancement - refs #2985 --- main/auth/profile.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/auth/profile.php b/main/auth/profile.php index 1fffd48523..67ecb3e562 100755 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -311,10 +311,10 @@ if (is_platform_authentication() && is_profile_editable() && api_get_setting('profile', 'password') == 'true' ) { - $form->addElement('password', 'password0', [get_lang('Pass'), get_lang('Enter2passToChange')], ['size' => 40]); - $form->addElement('password', 'password1', get_lang('NewPass'), ['id' => 'password1', 'size' => 40]); + $form->addElement('password', 'password0', [get_lang('Pass'), get_lang('ChangePasswordCurrent')], ['size' => 40]); + $form->addElement('password', 'password1', [get_lang('NewPass'), get_lang('EnterNewPassword')], ['id' => 'password1', 'size' => 40]); - $form->addElement('password', 'password2', get_lang('Confirmation'), ['size' => 40]); + $form->addElement('password', 'password2', [get_lang('Confirmation'), get_lang('RepeatYouNewPassword')], ['size' => 40]); // user must enter identical password twice so we can prevent some user errors $form->addRule(['password1', 'password2'], get_lang('PassTwo'), 'compare'); $form->addPasswordRule('password1'); From 38fb5b6565777a403304bec277a4c0227bf1841a Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Wed, 4 Sep 2019 10:10:06 +0200 Subject: [PATCH 04/10] Update password change form language terms - extends 461e8ed0 - refs #2985 --- main/auth/profile.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/auth/profile.php b/main/auth/profile.php index 67ecb3e562..9602703716 100755 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -311,10 +311,10 @@ if (is_platform_authentication() && is_profile_editable() && api_get_setting('profile', 'password') == 'true' ) { - $form->addElement('password', 'password0', [get_lang('Pass'), get_lang('ChangePasswordCurrent')], ['size' => 40]); - $form->addElement('password', 'password1', [get_lang('NewPass'), get_lang('EnterNewPassword')], ['id' => 'password1', 'size' => 40]); + $form->addElement('password', 'password0', [get_lang('Pass'), get_lang('TypeCurrentPassword')], ['size' => 40]); + $form->addElement('password', 'password1', [get_lang('NewPass'), get_lang('EnterYourNewPassword')], ['id' => 'password1', 'size' => 40]); - $form->addElement('password', 'password2', [get_lang('Confirmation'), get_lang('RepeatYouNewPassword')], ['size' => 40]); + $form->addElement('password', 'password2', [get_lang('Confirmation'), get_lang('RepeatYourNewPassword')], ['size' => 40]); // user must enter identical password twice so we can prevent some user errors $form->addRule(['password1', 'password2'], get_lang('PassTwo'), 'compare'); $form->addPasswordRule('password1'); From b5ef1fa4ac45e0d0882d511dedfed4251dc35cf9 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Wed, 4 Sep 2019 10:15:01 +0200 Subject: [PATCH 05/10] Update language terms --- main/lang/arabic/trad4all.inc.php | 25 +++++++++++++++++++++++- main/lang/asturian/trad4all.inc.php | 2 +- main/lang/basque/trad4all.inc.php | 2 +- main/lang/brazilian/trad4all.inc.php | 2 +- main/lang/bulgarian/trad4all.inc.php | 2 +- main/lang/catalan/trad4all.inc.php | 2 +- main/lang/croatian/trad4all.inc.php | 2 +- main/lang/danish/trad4all.inc.php | 2 +- main/lang/dutch/trad4all.inc.php | 2 +- main/lang/english/trad4all.inc.php | 4 +++- main/lang/esperanto/trad4all.inc.php | 2 +- main/lang/faroese/trad4all.inc.php | 2 +- main/lang/finnish/trad4all.inc.php | 2 +- main/lang/french/trad4all.inc.php | 4 +++- main/lang/galician/trad4all.inc.php | 2 +- main/lang/german/trad4all.inc.php | 3 ++- main/lang/greek/trad4all.inc.php | 2 +- main/lang/hungarian/trad4all.inc.php | 2 +- main/lang/indonesian/trad4all.inc.php | 2 +- main/lang/italian/trad4all.inc.php | 2 +- main/lang/japanese/trad4all.inc.php | 2 +- main/lang/korean/trad4all.inc.php | 2 +- main/lang/latvian/trad4all.inc.php | 2 +- main/lang/lithuanian/trad4all.inc.php | 2 +- main/lang/macedonian/trad4all.inc.php | 2 +- main/lang/persian/trad4all.inc.php | 2 +- main/lang/polish/trad4all.inc.php | 2 +- main/lang/portuguese/trad4all.inc.php | 2 +- main/lang/quechua_cusco/trad4all.inc.php | 2 +- main/lang/romanian/trad4all.inc.php | 2 +- main/lang/russian/trad4all.inc.php | 2 +- main/lang/serbian/trad4all.inc.php | 2 +- main/lang/simpl_chinese/trad4all.inc.php | 2 +- main/lang/slovak/trad4all.inc.php | 2 +- main/lang/slovenian/trad4all.inc.php | 2 +- main/lang/spanish/trad4all.inc.php | 4 +++- main/lang/spanish_latin/trad4all.inc.php | 2 +- main/lang/swedish/trad4all.inc.php | 2 +- main/lang/tagalog/trad4all.inc.php | 2 +- main/lang/thai/trad4all.inc.php | 2 +- main/lang/trad_chinese/trad4all.inc.php | 2 +- main/lang/turkish/trad4all.inc.php | 2 +- 42 files changed, 72 insertions(+), 42 deletions(-) diff --git a/main/lang/arabic/trad4all.inc.php b/main/lang/arabic/trad4all.inc.php index d0cd800ae6..ca952678a5 100644 --- a/main/lang/arabic/trad4all.inc.php +++ b/main/lang/arabic/trad4all.inc.php @@ -3902,7 +3902,7 @@ $NewMessageInForum = "نشر رسالة جديدة في المنتدى"; $FolderCreated = "تم إنشاء مجلد جديد"; $AgendaAdded = "اضافة حدث"; $ShouldBeCSVFormat = "الملف يجب أن يكون بتنسيق CSV . لا تدخل مسافات. البنية يجب أن تكون مضبوطة"; -$Enter2passToChange = "ادخل كلمة المرور مرتين لتغييرها. أو اترك الحقول فارغة"; +$TypeCurrentPassword = "ادخل كلمة المرور مرتين لتغييرها. أو اترك الحقول فارغة"; $AuthInfo = "التحقق"; $ImageWrong = "يجب أن يكون حجم الملف أقل من"; $NewPass = "كلمة المرور"; @@ -8430,4 +8430,27 @@ $WelcomeToPortalXInCourseSessionX = "مرحبا بك في منصة %s مقرر $WelcomeToPortalXInCourseSessionXCoursePartOfCareerX = "مرحبا بك في منصة %s في مقرر %s, جزء من وظيفة %s"; $YourNextModule = "درسك التالي"; $FirstLesson = "الدرس الاول"; +$ImportCourseTeachersAsCourseCoach = "استيراد مدرسي المقرر كمدرسين للمقرر في الموسم"; +$ResumeImport = "استئناف الاستيراد"; +$Candidate = "مرشح"; +$GeneralTotal = "المجموع العام"; +$Domains = "Domains"; +$ScormStartAttemptDate = "التاريخ"; +$LoginsByDate = "تسجيلات الدخول وفقا للتاريخ"; +$AllowHtaccessScormImport = "السماح لـ htaccess عند استيراد ملف سكورم"; +$ExerciseAutoEvaluationAndRankingMode = "وضع التقييم والترتيب التلقائي"; +$YouAreReceivingACopyBecauseYouAreACourseCoach = "لقد استلمت نسخة بسبب كونك معلم للمقرر الدراسي"; +$GenerateReport = "انشاء تقرير"; +$VersionFromVersionFile = "الاصدار من ملف الاصدار"; +$VersionFromConfigFile = "الاصدار من ملف التهيئة config"; +$TheVersionFromTheVersionFileIsUpdatedWithEachVersionIfMainInstallDirectoryIsPresent = "يتم تحديث الاصدار مع كل اصدار في حال كان مسار التنصيب الافتراضي موجودا"; +$TheVersionFromTheConfigurationFileShowsOnTheAdminPageButHasToBeChangedManuallyOnUpgrade = "الاصدار من ملف التهيئة الرئيسي يتم عرضه في صفحة الادارة الرئيسية، الا انه يجب تحديثه يدويا عند ترقية الاصدار"; +$ResultsConfigurationPage = "تهيئة صفحة النتائج"; +$HideExpectedAnswer = "اخفاء عمود الاجابات المتوقعة"; +$HideTotalScore = "اخفاء مجموع الدرجات"; +$HideQuestionScore = "اخفاء درجة السؤال"; +$SaveAnswers = "حفظ الاجابات"; +$SaveAllAnswers = "ملئ مسبق للاجوبة من المحاولة السابقة"; +$SubscribeUsersToAllForumNotifications = "التسجيل التلقائي لكافة المستخدمين في جميع اشعارات المنتدى"; +$ExerciseDirectPopUp = "المعلومات المرتجعة المباشرة بشكل منبثق"; ?> \ No newline at end of file diff --git a/main/lang/asturian/trad4all.inc.php b/main/lang/asturian/trad4all.inc.php index 8eecd904c5..c7bc1e2344 100644 --- a/main/lang/asturian/trad4all.inc.php +++ b/main/lang/asturian/trad4all.inc.php @@ -3351,7 +3351,7 @@ $NewMessageInForum = "Espublizóse un mensaxe nuevu nel foru"; $FolderCreated = "Creóse un direutoriu nuevu"; $AgendaAdded = "Amestóse un eventu a la axenda"; $ShouldBeCSVFormat = "L'archivu tien de tar en formatu CSV. Nun ponga espacios. La estructura tien de ser, esautamente:"; -$Enter2passToChange = "Pa cambiar la seña, escriba la nueva nestos dos campos. Si quier caltener l'actual, nun escriba nada."; +$TypeCurrentPassword = "Pa cambiar la seña, escriba la nueva nestos dos campos. Si quier caltener l'actual, nun escriba nada."; $AuthInfo = "Identificación"; $ImageWrong = "L'archivu tien de tener un tamañu menor de"; $NewPass = "Contraseña nueva"; diff --git a/main/lang/basque/trad4all.inc.php b/main/lang/basque/trad4all.inc.php index 6950aac02d..d21e869fc6 100644 --- a/main/lang/basque/trad4all.inc.php +++ b/main/lang/basque/trad4all.inc.php @@ -3451,7 +3451,7 @@ $NewMessageInForum = "Forora mezu berria bidali da"; $FolderCreated = "Karpeta berria sortu da"; $AgendaAdded = "Agendako gertaera bat gehitu da"; $ShouldBeCSVFormat = "Fitxategiak CSV formatua eduki behar du. Ez sartu espaziorik. Egitura, zehatz-mehatz, honako hau izan behar da :"; -$Enter2passToChange = "Pasahitza aldatzeko, idatzi pasahitza berria azpiko eremu bietan, horrela baieztatzeko. Oraingo pasahitza bere horretan edukitzeko, utzi eremuak bete gabe."; +$TypeCurrentPassword = "Pasahitza aldatzeko, idatzi pasahitza berria azpiko eremu bietan, horrela baieztatzeko. Oraingo pasahitza bere horretan edukitzeko, utzi eremuak bete gabe."; $AuthInfo = "Autentifikazioa"; $ImageWrong = "Fitxategi tamaina txikiagoa izan behar da honakoa baino:"; $NewPass = "Pasahitza berria"; diff --git a/main/lang/brazilian/trad4all.inc.php b/main/lang/brazilian/trad4all.inc.php index e9b095a14b..f16ff12bca 100644 --- a/main/lang/brazilian/trad4all.inc.php +++ b/main/lang/brazilian/trad4all.inc.php @@ -3872,7 +3872,7 @@ $NewMessageInForum = "Nova mensagem publicada no fórum"; $FolderCreated = "Criada nova pasta"; $AgendaAdded = "Acrescentado ítem na agenda"; $ShouldBeCSVFormat = "O arquivo precisa estar no formato CSV. Não adicione espaços. A estrutura deve ser exatamente :"; -$Enter2passToChange = "Informe a sua senha duas vezes para modificá-la. Caso não o queira, deixe os campos em branco."; +$TypeCurrentPassword = "Informe a sua senha duas vezes para modificá-la. Caso não o queira, deixe os campos em branco."; $AuthInfo = "Autenticação"; $ImageWrong = "O arquivo deve ser menor que"; $NewPass = "Nova senha"; diff --git a/main/lang/bulgarian/trad4all.inc.php b/main/lang/bulgarian/trad4all.inc.php index c61deab8a1..c53f5f87c2 100644 --- a/main/lang/bulgarian/trad4all.inc.php +++ b/main/lang/bulgarian/trad4all.inc.php @@ -3324,7 +3324,7 @@ $NewMessageInForum = "Изпратено е съобщение във форум $FolderCreated = "Създадена е папка."; $AgendaAdded = "Добавено е събитие в програмата."; $ShouldBeCSVFormat = "Файлът трябва да е в CSV-формат. Не вмъквайте интервали. Структурата трябва да е както следва: \""; -$Enter2passToChange = "Въведете вашата парола два пъти, за да я смените.
Оставете двете полета празни, ако не искате да смените паролата."; +$TypeCurrentPassword = "Въведете вашата парола два пъти, за да я смените.
Оставете двете полета празни, ако не искате да смените паролата."; $AuthInfo = "Автентикация"; $ImageWrong = "Размерът на файла трябва да е по-малък от"; $NewPass = "Нова парола"; diff --git a/main/lang/catalan/trad4all.inc.php b/main/lang/catalan/trad4all.inc.php index 8347c7ca97..da75fe4fc3 100644 --- a/main/lang/catalan/trad4all.inc.php +++ b/main/lang/catalan/trad4all.inc.php @@ -3801,7 +3801,7 @@ $NewMessageInForum = "Un nou missatge ha estat publicat en el fòrum"; $FolderCreated = "S'ha creat un nou directori"; $AgendaAdded = "S'ha afegit un esdeveniment de l'agenda"; $ShouldBeCSVFormat = "L'arxiu ha d'estar format CSV. No afegeixi espais. L'estructura ha de ser exactament:"; -$Enter2passToChange = "Per a canviar la contrasenya, introdueixi la nova contrasenya en aquests dos camps. Si desitja mantenir l'actual, deixi buits els dos camps."; +$TypeCurrentPassword = "Per a canviar la contrasenya, introdueixi la nova contrasenya en aquests dos camps. Si desitja mantenir l'actual, deixi buits els dos camps."; $AuthInfo = "Autentificació"; $ImageWrong = "L'arxiu ha de tenir una grandària menor de"; $NewPass = "Nova contrasenya"; diff --git a/main/lang/croatian/trad4all.inc.php b/main/lang/croatian/trad4all.inc.php index a221a3e45e..7bde393345 100644 --- a/main/lang/croatian/trad4all.inc.php +++ b/main/lang/croatian/trad4all.inc.php @@ -2306,7 +2306,7 @@ $NewMessageInForum = "Objavljena nova poruka na forumu"; $FolderCreated = "Dodana nova datoteka"; $AgendaAdded = "Dodan novi zapis u raspored"; $ShouldBeCSVFormat = "Datoteka treba biti formata CSV. Ne dodavajte razmake. Struktura bi trebala biti upravo:"; -$Enter2passToChange = "Unesite zaporku dvaput kako biste je promijenili. U suprotnome ostavite polja praznima."; +$TypeCurrentPassword = "Unesite zaporku dvaput kako biste je promijenili. U suprotnome ostavite polja praznima."; $AuthInfo = "Autentifikacija"; $ImageWrong = "Veličina datoteke treba biti manja od"; $NewPass = "Nova zaporka"; diff --git a/main/lang/danish/trad4all.inc.php b/main/lang/danish/trad4all.inc.php index dce1e92b2e..52b906db83 100644 --- a/main/lang/danish/trad4all.inc.php +++ b/main/lang/danish/trad4all.inc.php @@ -2151,7 +2151,7 @@ $NewMessageInForum = "Der er skrevet et nyt indlæg i diskussionsforummet"; $FolderCreated = "Ny mappe er oprettet"; $AgendaAdded = "Aftale er tilføjet"; $ShouldBeCSVFormat = "Filen ska være i CSV format. Tilføj ikke mellemrum. Strukturen skal nøjagtigt være:"; -$Enter2passToChange = "Indtast dit adgangskode to gange for at ændre det. Hvis ikke, skal du lade felterne stå tomme."; +$TypeCurrentPassword = "Indtast dit adgangskode to gange for at ændre det. Hvis ikke, skal du lade felterne stå tomme."; $AuthInfo = "Godkendelse"; $ImageWrong = "Filstørrelsen skal være mindre end"; $password_request = "Du har bedt om at få nulstille din adgangskode. Hvis du ikke har bedt om dette, skal du se bort fra denne mail. For at nulstille din adgangskode, skal du klikke på \"nulstil\" linket."; diff --git a/main/lang/dutch/trad4all.inc.php b/main/lang/dutch/trad4all.inc.php index f660052d29..c09f55b8d3 100644 --- a/main/lang/dutch/trad4all.inc.php +++ b/main/lang/dutch/trad4all.inc.php @@ -3851,7 +3851,7 @@ $NewMessageInForum = "Nieuw bericht geplaatst in het forum"; $FolderCreated = "Nieuwe folder aangemaakt"; $AgendaAdded = "Agenda item toegevoegd"; $ShouldBeCSVFormat = "Het bestand moet in CSV-formaat zijn. Voeg geen spaties toe. De structuur moet exact zijn zoals:"; -$Enter2passToChange = "Nieuw wachtwoord tweemaal invullen, of blanco laten om het huidige te behouden."; +$TypeCurrentPassword = "Nieuw wachtwoord tweemaal invullen, of blanco laten om het huidige te behouden."; $AuthInfo = "Authenticatie"; $ImageWrong = "De bestandsgrootte voor de foto moet kleiner zijn dan"; $NewPass = "Nieuw wachtwoord"; diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index a02de2c92b..2582f8768b 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -3910,7 +3910,7 @@ $NewMessageInForum = "New message posted in the forum"; $FolderCreated = "New folder created"; $AgendaAdded = "Event added"; $ShouldBeCSVFormat = "File should be CSV format. Do not add spaces. Structure should be exactly :"; -$Enter2passToChange = "To change your password, enter your current password in the field above and your new password in both fields below. To maintain the current password, leave the three fields empty."; +$TypeCurrentPassword = "To change your password, enter your current password in the field above and your new password in both fields below. To maintain the current password, leave the three fields empty."; $AuthInfo = "Authentication"; $ImageWrong = "The file size should be smaller than"; $NewPass = "New password"; @@ -8427,4 +8427,6 @@ $MaxEndDate = "Last connection"; $TotalDuration = "Total time spent"; $RealisationCertificate = "Certificate of achievement"; $SurveysReport = "Surveys report"; +$EnterYourNewPassword = "Enter your new password here."; +$RepeatYourNewPassword = "Type your new password once again, to reduce the likeliness of typing errors."; ?> \ No newline at end of file diff --git a/main/lang/esperanto/trad4all.inc.php b/main/lang/esperanto/trad4all.inc.php index 11fb695253..1a676611a2 100644 --- a/main/lang/esperanto/trad4all.inc.php +++ b/main/lang/esperanto/trad4all.inc.php @@ -1804,7 +1804,7 @@ $UsageDatacreated = "Uzulaj datumoj kreitaj"; $SessionView = "Prezenti la kursojn laŭ sesioj"; $CourseView = "Prezenti la kompletan liston da kursoj"; $ShouldBeCSVFormat = "La dosiero estu CSV-formata. Ne enmetu spacetojn. La strukturo estu precize kiel:"; -$Enter2passToChange = "Dufoje enigi novan pasvorton, aŭ enigi nenion por konservi vian aktualan"; +$TypeCurrentPassword = "Dufoje enigi novan pasvorton, aŭ enigi nenion por konservi vian aktualan"; $AuthInfo = "Aŭtentikigo"; $ImageWrong = "La grando de la foto estu maksimume"; $password_request = "Vi petis sendi vian pasvorton. Se vi ne faris tion, ignoru ĉi-mesaĝon. Por reagordi vian mesaĝon, musklaku sur la reagordan ligilon."; diff --git a/main/lang/faroese/trad4all.inc.php b/main/lang/faroese/trad4all.inc.php index 7b76ba25ab..259f391db6 100644 --- a/main/lang/faroese/trad4all.inc.php +++ b/main/lang/faroese/trad4all.inc.php @@ -180,7 +180,7 @@ $Helptwo = "Hjálp"; $MenuGeneral = "Hjálp"; $UsersOnLineList = "Innritaðir brúkarar"; $HelpMaj = "Hjálp"; -$Enter2passToChange = "Ynskir tú at broyta loyniorð, skriva so núverandi loyniorðið inn omanfyri, og skriva nýggja loyniorðið í báðar kassarnar niðanfyri. Letur tú allar tríggjar kassarnar vera blankar, varðveitir tú verandi loyniorðið."; +$TypeCurrentPassword = "Ynskir tú at broyta loyniorð, skriva so núverandi loyniorðið inn omanfyri, og skriva nýggja loyniorðið í báðar kassarnar niðanfyri. Letur tú allar tríggjar kassarnar vera blankar, varðveitir tú verandi loyniorðið."; $NewPass = "Nýtt loyniorð"; $UserPicture = "Mynd"; $Confirmation = "Endurtak nýggja loyniorðið"; diff --git a/main/lang/finnish/trad4all.inc.php b/main/lang/finnish/trad4all.inc.php index f8b615e6fe..ceb19d114d 100644 --- a/main/lang/finnish/trad4all.inc.php +++ b/main/lang/finnish/trad4all.inc.php @@ -2504,7 +2504,7 @@ $NewMessageInForum = "Uusi viesti keskustelualueella"; $FolderCreated = "Uusi kansio tehty"; $AgendaAdded = "Tapahtuma lisätty"; $ShouldBeCSVFormat = "Tiedoston tulee olla CSV-formaatissa. Älä lisää välilyöntejä. Tiedoston rakenteen tulee olla tarkasti seuraava:"; -$Enter2passToChange = "Vaihtaaksesi salasanasi syötä se kaksi kertaa. Muussa tapauksessa jätä kentät tyhjiksi."; +$TypeCurrentPassword = "Vaihtaaksesi salasanasi syötä se kaksi kertaa. Muussa tapauksessa jätä kentät tyhjiksi."; $AuthInfo = "Tunnistaminen"; $ImageWrong = "Tiedoston koon pitäisi olla pienempi kuin"; $NewPass = "Uusi salasana"; diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php index 324d4b7bd8..be3f17f373 100644 --- a/main/lang/french/trad4all.inc.php +++ b/main/lang/french/trad4all.inc.php @@ -3900,7 +3900,7 @@ $NewMessageInForum = "Un nouveau message a été posté dans le forum"; $FolderCreated = "Un nouveau dossier a été créé"; $AgendaAdded = "Un évènement d'agenda a été ajouté"; $ShouldBeCSVFormat = "Le fichier devrait être au format CSV. N'ajoutez pas d'espaces. La structure devrait être exactement :"; -$Enter2passToChange = "La saisie du nouveau mot de passe ainsi que sa confirmation sont nécessaires en cas de modification de votre mot de passe.
Dans tous les autres cas, laissez ces deux champs vides."; +$TypeCurrentPassword = "Saisissez votre mot de passe actuel ci-dessus pour autoriser le changement de mot de passe. Ensuite, introduisez votre nouveau mot de passe deux fois de suite, ci-dessous. Pour ne pas changer votre mot de passe, laissez ces 3 champs vides."; $AuthInfo = "Paramètres de connexion"; $ImageWrong = "La taille du fichier doit être inférieure à"; $NewPass = "Nouveau mot de passe"; @@ -8359,4 +8359,6 @@ $MaxEndDate = "Dernière connexion"; $TotalDuration = "Temps passé total"; $RealisationCertificate = "Certificat de réalisation"; $SurveysReport = "Rapport d'enquêtes"; +$EnterYourNewPassword = "Saisissez votre nouveau mot de passe ici."; +$RepeatYourNewPassword = "Saisissez votre nouveau mot de passe une fois de plus ici, pour éviter les erreurs."; ?> \ No newline at end of file diff --git a/main/lang/galician/trad4all.inc.php b/main/lang/galician/trad4all.inc.php index c59ddc4ac5..4ca853b26a 100644 --- a/main/lang/galician/trad4all.inc.php +++ b/main/lang/galician/trad4all.inc.php @@ -3878,7 +3878,7 @@ $NewMessageInForum = "Publicouse unha nova mensaxe no foro"; $FolderCreated = "Creouse un novo directorio"; $AgendaAdded = "Engadíuse un evento da axenda"; $ShouldBeCSVFormat = "O arquivo debe estar en formato CSV. Non engada espazos. A estrutura debe ser exactamente:"; -$Enter2passToChange = "Introuduce o teu contrasinal dúas veces para cambialo. Se non queres cambialo, deixa o espazo en branco."; +$TypeCurrentPassword = "Introuduce o teu contrasinal dúas veces para cambialo. Se non queres cambialo, deixa o espazo en branco."; $AuthInfo = "Autentificación"; $ImageWrong = "O ficheiro coa imaxe debe ser menor de"; $NewPass = "Novo contrasinal"; diff --git a/main/lang/german/trad4all.inc.php b/main/lang/german/trad4all.inc.php index 3f7280ea85..ce00c5ad9b 100644 --- a/main/lang/german/trad4all.inc.php +++ b/main/lang/german/trad4all.inc.php @@ -3870,7 +3870,7 @@ $NewMessageInForum = "Neuer Beitrag wurde im Forum hinzugefügt"; $FolderCreated = "Neues Verzeichnis wurde erstellt"; $AgendaAdded = "Kalender Eintrag wurde hinzugefügt"; $ShouldBeCSVFormat = "Die Datei sollte im CSV-Fomrat sein. Fügen Sie keine Leerzeichen ein. Die Struktur sollte wie folgt aussehen:"; -$Enter2passToChange = "Wenn Sie Ihr Passwort ändern möchten, geben Sie das neue Passwort bitte zweimal ein. Andernfalls lassen Sie diese Felder einfach frei."; +$TypeCurrentPassword = "Wenn Sie Ihr Passwort ändern möchten, geben Sie das neue Passwort bitte zweimal ein. Andernfalls lassen Sie diese Felder einfach frei."; $AuthInfo = "Authentifizierung"; $ImageWrong = "Die Dateigröße sollte geringer sein als"; $NewPass = "Neues Kennwort"; @@ -7986,4 +7986,5 @@ Die Nachricht ist an %s sichtbar"; $PersonalDataReport = "Persönliche Daten"; $FromTimeX = "Von %s"; $ToTimeX = "bis %s"; +$SubscribeUsersToAllForumNotifications = "Automatisch alle Benutzer anmelden"; ?> \ No newline at end of file diff --git a/main/lang/greek/trad4all.inc.php b/main/lang/greek/trad4all.inc.php index 38b9e25d9c..202d870f68 100644 --- a/main/lang/greek/trad4all.inc.php +++ b/main/lang/greek/trad4all.inc.php @@ -3881,7 +3881,7 @@ $NewMessageInForum = "Νέο μήνυμα αναρτήθηκε στο forum"; $FolderCreated = "Δημιουγήθηκε νέος φάκελος"; $AgendaAdded = "Προστέθηκε γεγονός"; $ShouldBeCSVFormat = "Το αρχείο πρέπει να είναι σε τύπου CSV. Να μην υπάρχουν κενά. Η δομή πρέπει να είναι ακτιβώς η"; -$Enter2passToChange = "Για να αλλάξετε το συνθηματικό σας, εισάγεται το τρέχων συνθηματικό σας στο παραπάνω πεδίο και το νέο στα 2 παρακάτω πεδία. Για να διατηρηθεί το τρέχων συνθηματικό, μην βάζετε τίποτα κια στα τρι (3) πεδία."; +$TypeCurrentPassword = "Για να αλλάξετε το συνθηματικό σας, εισάγεται το τρέχων συνθηματικό σας στο παραπάνω πεδίο και το νέο στα 2 παρακάτω πεδία. Για να διατηρηθεί το τρέχων συνθηματικό, μην βάζετε τίποτα κια στα τρι (3) πεδία."; $AuthInfo = "Πιστοποίηση"; $ImageWrong = "Το μέγεθος του αρχείου πρέπει να είναι μικρότερο από"; $NewPass = "Νέο συνθηματικό"; diff --git a/main/lang/hungarian/trad4all.inc.php b/main/lang/hungarian/trad4all.inc.php index b1b3fd99b7..355f830005 100644 --- a/main/lang/hungarian/trad4all.inc.php +++ b/main/lang/hungarian/trad4all.inc.php @@ -2568,7 +2568,7 @@ $NewMessageInForum = "Új üzenet lett a létrehozva a fórumban"; $FolderCreated = "Az új mappa létrehozva"; $AgendaAdded = "Naptári elem hozzáadva"; $ShouldBeCSVFormat = "A fájlnak CSV formátumúnak kell lennie. Ne tegyen bele szóközöket. A struktúra pontosan az alábbiak szerinti legyen:"; -$Enter2passToChange = "Írja be kétszer jelszavát a megváltoztatásához. Hagyja üresen a mezőket, ha nem kívánja megváltoztatni jelszavát."; +$TypeCurrentPassword = "Írja be kétszer jelszavát a megváltoztatásához. Hagyja üresen a mezőket, ha nem kívánja megváltoztatni jelszavát."; $AuthInfo = "Ellenőrzés"; $ImageWrong = "A fájl mérte nem lehet nagyobb, mint"; $NewPass = "Új jelszó"; diff --git a/main/lang/indonesian/trad4all.inc.php b/main/lang/indonesian/trad4all.inc.php index 64d478430c..02224025e9 100644 --- a/main/lang/indonesian/trad4all.inc.php +++ b/main/lang/indonesian/trad4all.inc.php @@ -1615,7 +1615,7 @@ $UsageDatacreated = "Penggunaan data yang dibuat"; $SessionView = "Tampilkan mata kuliah diurut menurut sesi"; $CourseView = "Tampilkan daftar lengkap mata kuliah"; $ShouldBeCSVFormat = "File haru dalam format CSV. Jangan tambah spasi. Struk harus seperti ini:"; -$Enter2passToChange = "Masukkan password dua kali untuk merubahnya. Jika tidak ingin merubah, biarkan kosong."; +$TypeCurrentPassword = "Masukkan password dua kali untuk merubahnya. Jika tidak ingin merubah, biarkan kosong."; $AuthInfo = "Autentikasi"; $ImageWrong = "Ukuran file harus lebih kecil dari"; $password_request = "Anda mengajukan me-reset password. Jika anda merasa tidak memohon, abaikan sja email ini. Untuk mereset password klik pada link reset."; diff --git a/main/lang/italian/trad4all.inc.php b/main/lang/italian/trad4all.inc.php index 95eba87fd5..7a2c04bf96 100644 --- a/main/lang/italian/trad4all.inc.php +++ b/main/lang/italian/trad4all.inc.php @@ -3887,7 +3887,7 @@ $NewMessageInForum = "Nuovo messaggio inviato nel forum"; $FolderCreated = "Nuova cartella creata"; $AgendaAdded = "Voce nell'agenda aggiunta"; $ShouldBeCSVFormat = "Il file deve essere in formato CSV. Non aggiungere spazi. L'esatta struttura deve essere:"; -$Enter2passToChange = "Inserisci due volte la password per cambiarla. Altrimenti, lascia i campi vuoti."; +$TypeCurrentPassword = "Inserisci due volte la password per cambiarla. Altrimenti, lascia i campi vuoti."; $AuthInfo = "Autenticazione"; $ImageWrong = "La dimensione del file deve essere minore di"; $NewPass = "Nuova password"; diff --git a/main/lang/japanese/trad4all.inc.php b/main/lang/japanese/trad4all.inc.php index 89e1bbd74d..d880f2f1cc 100644 --- a/main/lang/japanese/trad4all.inc.php +++ b/main/lang/japanese/trad4all.inc.php @@ -961,7 +961,7 @@ $UsersOnLineList = "オンライン ユーザー一覧"; $SystemAnnouncements = "プラットフォームのお知らせ"; $HelpMaj = "へルプ"; $Login = "ログイン"; -$Enter2passToChange = "パスワードを変更するには、上のフィールドに現在のパスワードを入力して、下の両方のフィールドに新しいパスワードを入力します。現在のパスワードを維持するには、3 つのフィールドを空のままにします。"; +$TypeCurrentPassword = "パスワードを変更するには、上のフィールドに現在のパスワードを入力して、下の両方のフィールドに新しいパスワードを入力します。現在のパスワードを維持するには、3 つのフィールドを空のままにします。"; $NewPass = "新しいパスワード"; $AddAU = "ユ〖ザを裁える"; $AddedU = "has been added. An email has been sent to give him his username"; diff --git a/main/lang/korean/trad4all.inc.php b/main/lang/korean/trad4all.inc.php index 82035ec252..d0f11a5527 100644 --- a/main/lang/korean/trad4all.inc.php +++ b/main/lang/korean/trad4all.inc.php @@ -1318,7 +1318,7 @@ $Teach = "수업 가능 과목"; $Productions = "저작물"; $SendChatRequest = "이 사람에게 대화신청 하기"; $RequestDenied = "대화신청이 거부되었습니다."; -$Enter2passToChange = "변경하려면 패스워드를 두 번 입력하십시오. 아니면, 필드를 비워주십시오."; +$TypeCurrentPassword = "변경하려면 패스워드를 두 번 입력하십시오. 아니면, 필드를 비워주십시오."; $password_request = "패스워드를 재설정하려면 요청을 하시기 바랍니다. 요청하지 않으면 이 메일은 무시됩니다. 패스워드를 재설정하기 위해서는 reset 링크를 클릭하십시오."; $YourPasswordHasBeenEmailed = "패스워드가 메일로 전송되었습니다."; $EnterEmailAndWeWillSendYouYourPassword = "등록 시에 사용한 이메일 주소를 입력하시면 패스워드를 전송하겠습니다."; diff --git a/main/lang/latvian/trad4all.inc.php b/main/lang/latvian/trad4all.inc.php index 608286cd02..e3a8127342 100644 --- a/main/lang/latvian/trad4all.inc.php +++ b/main/lang/latvian/trad4all.inc.php @@ -3244,7 +3244,7 @@ $NewMessageInForum = "Jauns ziņojums publicēts forumā"; $FolderCreated = "Izveidota jauna direktorija"; $AgendaAdded = "Pievienots notikums"; $ShouldBeCSVFormat = "Failam jābūt CSV formātā. Nepievienojiet tukšumus. Struktūrai jābūt tieši šādai:"; -$Enter2passToChange = "Lai veiktu paroles maiņu, ievadiet to abos lauciņos zemāk. Ja nevēlaties to darīt, atstājiet lauciņus tukšus."; +$TypeCurrentPassword = "Lai veiktu paroles maiņu, ievadiet to abos lauciņos zemāk. Ja nevēlaties to darīt, atstājiet lauciņus tukšus."; $AuthInfo = "Autorizēšanās"; $ImageWrong = "Dokumenta izmēram jābūt mazākam par"; $NewPass = "Jauna parole"; diff --git a/main/lang/lithuanian/trad4all.inc.php b/main/lang/lithuanian/trad4all.inc.php index f9c9de4bc6..1ed4ad15bd 100644 --- a/main/lang/lithuanian/trad4all.inc.php +++ b/main/lang/lithuanian/trad4all.inc.php @@ -2007,7 +2007,7 @@ $NewMessageInForum = "New message posted in the forum"; $FolderCreated = "New folder created"; $AgendaAdded = "Agenda item added"; $ShouldBeCSVFormat = "Failas turi buti CSV formato. Napalikite tarpų. Struktūra turi būti tiksli :"; -$Enter2passToChange = "Keisdami įveskite savo slaptažodį dukart. Kitaip palikite šiuos laukus tuščius."; +$TypeCurrentPassword = "Keisdami įveskite savo slaptažodį dukart. Kitaip palikite šiuos laukus tuščius."; $AuthInfo = "Autentifikacija"; $ImageWrong = "Failo dydis turi buti mažesnis negu"; $password_request = "Jūsų paprašė pakeisti slaptažodį į pradinį.Jei jūs neprašėte, ignoruokite šį laišką.Kad pakeisti slaptažodį į pradinį, spauskite ant nuorodos."; diff --git a/main/lang/macedonian/trad4all.inc.php b/main/lang/macedonian/trad4all.inc.php index a5a452345a..7c65da1b6f 100644 --- a/main/lang/macedonian/trad4all.inc.php +++ b/main/lang/macedonian/trad4all.inc.php @@ -1975,7 +1975,7 @@ $NewMessageInForum = "Новата порака е објавена на фор $FolderCreated = "Новата папка е креирана"; $AgendaAdded = "Додаден е елементот на календарот"; $ShouldBeCSVFormat = "Датотеката реба да биде во CSV формат. Не додавајте празни места. Структирата треба да е точно:"; -$Enter2passToChange = "Внесете ја вашата лозинка двапати за да ја промените. Во спротивно, оставете ги полињата празни."; +$TypeCurrentPassword = "Внесете ја вашата лозинка двапати за да ја промените. Во спротивно, оставете ги полињата празни."; $AuthInfo = "Проверка на автентичноста"; $ImageWrong = "Гоемината на датотеката треба да е помала од"; $password_request = "Побаравте да преправите Вашата лозинка. Ако не сте побарале, тогаш игнорирајте ја оваа порака. За да ја преправите Вашата лозинка кликнете на врската преправи."; diff --git a/main/lang/persian/trad4all.inc.php b/main/lang/persian/trad4all.inc.php index 3676d14ff1..9bb9fa4ffc 100644 --- a/main/lang/persian/trad4all.inc.php +++ b/main/lang/persian/trad4all.inc.php @@ -2556,7 +2556,7 @@ $NewMessageInForum = "پیام جدید در انجمن ارسال شد"; $FolderCreated = "پوشه جدید ساخته شد"; $AgendaAdded = "رویداد اضافه شد"; $ShouldBeCSVFormat = "فایل مورد نظر باید از نوع سی اس وی باشد. هیچ فاصلۀ اضافی نمی بایست افزوده شود . ساختار باید عیناً به صورت زیر باشد"; -$Enter2passToChange = "در صورتی که می خواهید رمز ورود خود را تغییر دهید، می بایست رمز جدید خود را دو بار وارد کنید. اگر نمی خواهید رمز ورود خود را تغییر دهید خانه های مربوط به تغییر رمز ورود را خالی بگذارید"; +$TypeCurrentPassword = "در صورتی که می خواهید رمز ورود خود را تغییر دهید، می بایست رمز جدید خود را دو بار وارد کنید. اگر نمی خواهید رمز ورود خود را تغییر دهید خانه های مربوط به تغییر رمز ورود را خالی بگذارید"; $AuthInfo = "تصدیق"; $ImageWrong = "حجم فایل مورد نظر باید کاهش یابد"; $NewPass = "کلمه عبور جدید"; diff --git a/main/lang/polish/trad4all.inc.php b/main/lang/polish/trad4all.inc.php index b087dc4832..cbeaa3373f 100644 --- a/main/lang/polish/trad4all.inc.php +++ b/main/lang/polish/trad4all.inc.php @@ -3445,7 +3445,7 @@ $NewMessageInForum = "Nowa wiadomość wysłana na forum"; $FolderCreated = "Nowy katalog utworzony"; $AgendaAdded = "Dodano zdarzenia"; $ShouldBeCSVFormat = "Plik powinien być w formacie CSV. Nie dodawaj spacji. Plik powinien mieć strukturę:"; -$Enter2passToChange = "Podaj nowe hasło dwukrotnie"; +$TypeCurrentPassword = "Podaj nowe hasło dwukrotnie"; $AuthInfo = "Autoryzacja"; $ImageWrong = "Rozmiar pliku powinien być mniejszy niż"; $NewPass = "Nowe hasło"; diff --git a/main/lang/portuguese/trad4all.inc.php b/main/lang/portuguese/trad4all.inc.php index 7d2f82654b..febe74612d 100644 --- a/main/lang/portuguese/trad4all.inc.php +++ b/main/lang/portuguese/trad4all.inc.php @@ -3877,7 +3877,7 @@ $NewMessageInForum = "Nova mensagem publicada no fórum"; $FolderCreated = "Nova pasta/directório criado"; $AgendaAdded = "Evento adicionado"; $ShouldBeCSVFormat = "O ficheiro deve de estar no formato CSV. Não adicione espaços. A estrutura deve ser exactamente :"; -$Enter2passToChange = "Para modificar a sua senha/password, introduza a sua senha/password actual no campo acima e a nova senha/password em ambos os campos abaixo desse. Para manter a senha/password actual, deixe os três campos vazios."; +$TypeCurrentPassword = "Para modificar a sua senha/password, introduza a sua senha/password actual no campo acima e a nova senha/password em ambos os campos abaixo desse. Para manter a senha/password actual, deixe os três campos vazios."; $AuthInfo = "Autenticação"; $ImageWrong = "O tamanho do ficheiro deve ser menor que"; $NewPass = "Nova senha/password"; diff --git a/main/lang/quechua_cusco/trad4all.inc.php b/main/lang/quechua_cusco/trad4all.inc.php index 81d5236bfc..ea6f8ddc3c 100644 --- a/main/lang/quechua_cusco/trad4all.inc.php +++ b/main/lang/quechua_cusco/trad4all.inc.php @@ -3070,7 +3070,7 @@ $NewMessageInForum = "Churarikun huj willakuy k'itirimanapii"; $FolderCreated = "Hoq musuq wayaqan ruwachikun"; $AgendaAdded = "Yapachikun huj ruway"; $ShouldBeCSVFormat = "Khipuqa CSV nisqapi kashan. Ama imatapas yapankichu. Imayna kasqanta kikillanpuni kanqa:"; -$Enter2passToChange = "Qelqa pakata t'ijrachinapqa haykuchiy hoq musuq qelqa pakata kay kanchakunapi. Sichus qepakuyta munaq ñaupaqwan chayqa, ajnallata saqey iskhay kanchakunata."; +$TypeCurrentPassword = "Qelqa pakata t'ijrachinapqa haykuchiy hoq musuq qelqa pakata kay kanchakunapi. Sichus qepakuyta munaq ñaupaqwan chayqa, ajnallata saqey iskhay kanchakunata."; $AuthInfo = "Cheqaqchana"; $ImageWrong = "Khipuqa kanqapuni kay yupamanta huch'uykama"; $NewPass = "Musuq qelqa-paka"; diff --git a/main/lang/romanian/trad4all.inc.php b/main/lang/romanian/trad4all.inc.php index 04485645df..a07fe064e3 100644 --- a/main/lang/romanian/trad4all.inc.php +++ b/main/lang/romanian/trad4all.inc.php @@ -3761,7 +3761,7 @@ $NewMessageInForum = "Mesaj nou postat pe forum"; $FolderCreated = "Creaza un nou folder"; $AgendaAdded = "Adauga agendei"; $ShouldBeCSVFormat = "Fisierul este in format CSV. Nu adaugati spatii. Structura treubie sa fie exact ca :"; -$Enter2passToChange = "Introdu parola de doua ori pentru a o schimba. Altfel lasa campurile libere"; +$TypeCurrentPassword = "Introdu parola de doua ori pentru a o schimba. Altfel lasa campurile libere"; $AuthInfo = "Autentificare"; $ImageWrong = "Fisierul trebuie sa fie mai mic de"; $NewPass = "Nou pin"; diff --git a/main/lang/russian/trad4all.inc.php b/main/lang/russian/trad4all.inc.php index ffbdbe79ce..11e8ce1719 100644 --- a/main/lang/russian/trad4all.inc.php +++ b/main/lang/russian/trad4all.inc.php @@ -2301,7 +2301,7 @@ $NewMessageInForum = "Новое сообщение разослано на фо $FolderCreated = "Новая папка создана"; $AgendaAdded = "Пункты повестки дня добавлены"; $ShouldBeCSVFormat = "Файл должен иметь формат CSV. Не добавляйте пробелы (пустые места). Структура должна быть в точности:"; -$Enter2passToChange = "Введите свой пароль дважды для того, чтобы изменить его. Или же оставьте поля пустыми."; +$TypeCurrentPassword = "Введите свой пароль дважды для того, чтобы изменить его. Или же оставьте поля пустыми."; $AuthInfo = "Идентификация"; $ImageWrong = "Размер файла должен быть меньше, чем"; $password_request = "Вы просили разрешения переустановить свой пароль. Если Вы не просили, то игнорируйте это письмо."; diff --git a/main/lang/serbian/trad4all.inc.php b/main/lang/serbian/trad4all.inc.php index 8e83400b50..d8100b1c49 100644 --- a/main/lang/serbian/trad4all.inc.php +++ b/main/lang/serbian/trad4all.inc.php @@ -1851,7 +1851,7 @@ $NewMessageInForum = "Objavljena nova poruka na forumu"; $FolderCreated = "Novi folder je kreiran"; $AgendaAdded = "Dodat novi dogadjaj u raspored"; $ShouldBeCSVFormat = "Fajl treba da bude u CSV formatu. Nemojte dodavati razmake. Struktura bi trebala da bude baš ovakva:"; -$Enter2passToChange = "Unesite vašu lozinku dva puta da biste je promenili. U suprotnom ostavite polja prazna."; +$TypeCurrentPassword = "Unesite vašu lozinku dva puta da biste je promenili. U suprotnom ostavite polja prazna."; $AuthInfo = "Autorizacija"; $ImageWrong = "Veličina fajla bi trebala da bude manja od"; $NewPass = "Nova Lozinka"; diff --git a/main/lang/simpl_chinese/trad4all.inc.php b/main/lang/simpl_chinese/trad4all.inc.php index 39b6040b27..cea7e0f6de 100644 --- a/main/lang/simpl_chinese/trad4all.inc.php +++ b/main/lang/simpl_chinese/trad4all.inc.php @@ -2421,7 +2421,7 @@ $SendChatRequest = "发送回复给这个人"; $RequestDenied = "已拒绝请求."; $UsageDatacreated = "已创建数据"; $ShouldBeCSVFormat = "文件应该是CSV格式，请不要加空格，结构应该是："; -$Enter2passToChange = "修改密码请重复输入两次，否则保持为空。"; +$TypeCurrentPassword = "修改密码请重复输入两次，否则保持为空。"; $AuthInfo = "有效"; $ImageWrong = "文件尺寸要小于"; $password_request = "您已经请求重新设置您的密码, 如果您确认, 可以忽略此邮件, 点击重置链接重新设置您的密码."; diff --git a/main/lang/slovak/trad4all.inc.php b/main/lang/slovak/trad4all.inc.php index 60c41b6768..e9ab726d12 100644 --- a/main/lang/slovak/trad4all.inc.php +++ b/main/lang/slovak/trad4all.inc.php @@ -3930,7 +3930,7 @@ $NewMessageInForum = "Nová správa poslaná do fóra"; $FolderCreated = "Nová zložka vytvorená"; $AgendaAdded = "Udalosť pridaná"; $ShouldBeCSVFormat = "Súbor by mal byť v CSV formáte. Nepridávajte medzery. Štruktúra by mala byť správne:"; -$Enter2passToChange = "Pre zmenenie zadajte svoje nové heslo dva krát. Inak nechajte políčka prázdne."; +$TypeCurrentPassword = "Pre zmenenie zadajte svoje nové heslo dva krát. Inak nechajte políčka prázdne."; $AuthInfo = "Overenie"; $ImageWrong = "Veľkosť súboru by mala byť menšia ako"; $NewPass = "Nové heslo"; diff --git a/main/lang/slovenian/trad4all.inc.php b/main/lang/slovenian/trad4all.inc.php index 333369add5..9aa000b677 100644 --- a/main/lang/slovenian/trad4all.inc.php +++ b/main/lang/slovenian/trad4all.inc.php @@ -3868,7 +3868,7 @@ $NewMessageInForum = "Novo sporočilo je bilo objavljeno v forumu"; $FolderCreated = "Nova mapa je bila ustvarjena"; $AgendaAdded = "Dogodek je bil dodan"; $ShouldBeCSVFormat = "Datoteka mora biti v CSV obliki. Ne dodajajte presledkov. Zgradba datoteke mora biti natančno kot :"; -$Enter2passToChange = "Za spremembo vnesite geslo dvakrat. Sicer pustite polji prazni."; +$TypeCurrentPassword = "Za spremembo vnesite geslo dvakrat. Sicer pustite polji prazni."; $AuthInfo = "Avtentifikacija"; $ImageWrong = "Velikost datoteke mora biti manjša od"; $NewPass = "Novo geslo"; diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index 0bbd34c421..71a3552865 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -3910,7 +3910,7 @@ $NewMessageInForum = "Ha sido publicado un nuevo mensaje en el foro"; $FolderCreated = "Ha sido creado un nuevo directorio"; $AgendaAdded = "Ha sido añadido un evento de la agenda"; $ShouldBeCSVFormat = "El archivo debe estar formato CSV. No añada espacios. La estructura debe ser exactamente :"; -$Enter2passToChange = "Para cambiar la contraseña, introduzca la nueva contraseña en estos dos campos. Si desea mantener la actual, deje vacíos los dos campos."; +$TypeCurrentPassword = "Para cambiar la contraseña, introduzca primero su contraseña actual en este campo. Luego, introduzca la nueva contraseña en los dos campos a continuación. Si desea mantener la contraseña actual, deje simplemente estos 3 campos vacíos."; $AuthInfo = "Autentificación"; $ImageWrong = "El archivo debe tener un tamaño menor de"; $NewPass = "Nueva contraseña"; @@ -8455,4 +8455,6 @@ $MaxEndDate = "Ultima conexion"; $TotalDuration = "Tiempo total pasado"; $RealisationCertificate = "Certificado de logro"; $SurveysReport = "Reporte de encuestas"; +$EnterYourNewPassword = "Introduzca su nueva contraseña aquí."; +$RepeatYourNewPassword = "Introduzca su nueva contraseña una vez más, para reducir la probabilidad de errores."; ?> \ No newline at end of file diff --git a/main/lang/spanish_latin/trad4all.inc.php b/main/lang/spanish_latin/trad4all.inc.php index 1b44d6ad96..c09b10766c 100644 --- a/main/lang/spanish_latin/trad4all.inc.php +++ b/main/lang/spanish_latin/trad4all.inc.php @@ -1785,7 +1785,7 @@ $UsageDatacreated = "Datos de uso creados"; $SessionView = "Mostrar los cursos ordenados por sesiones"; $CourseView = "Mostrar toda la lista de cursos"; $ShouldBeCSVFormat = "El archivo debe estar formato CSV. No añada espacios. La estructura debe ser exactamente :"; -$Enter2passToChange = "Para cambiar la contraseña, introduzca la nueva contraseña en estos dos campos. Si desea mantener la actual, deje vacíos ambos."; +$TypeCurrentPassword = "Para cambiar la contraseña, introduzca la nueva contraseña en estos dos campos. Si desea mantener la actual, deje vacíos ambos."; $AuthInfo = "Autentificación"; $ImageWrong = "El archivo debe tener un tamaño menor de"; $password_request = "Ha solicitado restablecer su contraseña. Si no lo ha solicitado, simplemente ignore este mensaje.Para generar una nueva contraseña haga click sobre el link \"restablecer\"."; diff --git a/main/lang/swedish/trad4all.inc.php b/main/lang/swedish/trad4all.inc.php index d22675f612..8210e91cd5 100644 --- a/main/lang/swedish/trad4all.inc.php +++ b/main/lang/swedish/trad4all.inc.php @@ -2317,7 +2317,7 @@ $NewMessageInForum = "Nytt meddelande postat till forumet"; $FolderCreated = "Ny mapp skapad"; $AgendaAdded = "Kalenderpost skapad"; $ShouldBeCSVFormat = "Filen skall vara i CSV format. Lägg inte till mellanrum. Strukturen skall hållas exakt:"; -$Enter2passToChange = "För att ändra ditt lösenord, skriv in ditt nuvarande lösenord i fältet ovan och ditt nya lösenord i båda fälten nedan. För att bibehålla det aktuella lösenordet, lämna de tre fält tomma."; +$TypeCurrentPassword = "För att ändra ditt lösenord, skriv in ditt nuvarande lösenord i fältet ovan och ditt nya lösenord i båda fälten nedan. För att bibehålla det aktuella lösenordet, lämna de tre fält tomma."; $AuthInfo = "Legitimering"; $ImageWrong = "Filstorleken skall vara mindre än"; $NewPass = "Nytt lösenord"; diff --git a/main/lang/tagalog/trad4all.inc.php b/main/lang/tagalog/trad4all.inc.php index c12c53edaa..898d9fbcc0 100644 --- a/main/lang/tagalog/trad4all.inc.php +++ b/main/lang/tagalog/trad4all.inc.php @@ -836,7 +836,7 @@ $MenuGeneral = "Tulong"; $UsersOnLineList = "Listahan ng mga gumagamit online"; $SystemAnnouncements = "Balita sa Portal"; $Login = "Login"; -$Enter2passToChange = "Upang baguhin ang iyong password, ipasok ang iyong kasalukuyang password sa field sa itaas at ang iyong bagong password sa parehong field sa ibaba. Upang mapanatili ang kasalukuyang password, iwanan ang tatlong mga field ng bakante."; +$TypeCurrentPassword = "Upang baguhin ang iyong password, ipasok ang iyong kasalukuyang password sa field sa itaas at ang iyong bagong password sa parehong field sa ibaba. Upang mapanatili ang kasalukuyang password, iwanan ang tatlong mga field ng bakante."; $NewPass = "Bagong password"; $UserPicture = "Larawan"; $ProfileReg = "Ang iyong bagong profile ay nai-save"; diff --git a/main/lang/thai/trad4all.inc.php b/main/lang/thai/trad4all.inc.php index fcabcbd2eb..4b391ab5a2 100644 --- a/main/lang/thai/trad4all.inc.php +++ b/main/lang/thai/trad4all.inc.php @@ -1473,7 +1473,7 @@ $Productions = "ผลงาน"; $SendChatRequest = "ส่งข้อความเชิญร่วมสนทนาออนไลน์"; $RequestDenied = "ไม่รับคำเชิญ"; $ShouldBeCSVFormat = "ไฟล์ต้องเป็นCSV,อย่าเว้นวรรค, โครงสร้างต้องเป็นดังนี้"; -$Enter2passToChange = "การเปลี่ยนรหัสผ่านใหม่ ให้กรอกรหัสผ่านที่ตั้งใหม่ทั้งสองชอง หากไม่เปลี่ยนก็ปล่อยว่างไว้"; +$TypeCurrentPassword = "การเปลี่ยนรหัสผ่านใหม่ ให้กรอกรหัสผ่านที่ตั้งใหม่ทั้งสองชอง หากไม่เปลี่ยนก็ปล่อยว่างไว้"; $AuthInfo = "การรับรองสิทธิ์"; $ImageWrong = "ขนาดไฟล์ต้องไม่เกิน"; $password_request = "คุณได้ทำคำร้องขอให้เปลี่ยนรหัสผ่านใหม่ ให้คุณยืนยันระบบอีกครั้งโดยการคลิกที่ link หากคุณเปลี่ยนใจหรือไม่ใด้ทำคำร้องเอง ให้ลบหรือไม่ต้องสนใจอีเมลฉบับนี้"; diff --git a/main/lang/trad_chinese/trad4all.inc.php b/main/lang/trad_chinese/trad4all.inc.php index 9cb07dca96..b992499a70 100644 --- a/main/lang/trad_chinese/trad4all.inc.php +++ b/main/lang/trad_chinese/trad4all.inc.php @@ -2082,7 +2082,7 @@ $NewMessageInForum = "討論區新帖子"; $FolderCreated = "已創建新資料夾"; $AgendaAdded = "已新增日程項目"; $ShouldBeCSVFormat = "檔案應該是CSV格式，請不要加空格，架構應該是︰"; -$Enter2passToChange = "修改密碼請重複輸入兩次，否則保持為空。"; +$TypeCurrentPassword = "修改密碼請重複輸入兩次，否則保持為空。"; $AuthInfo = "有效"; $ImageWrong = "檔案尺寸要小於"; $password_request = "你要求重設密碼。若你並未提出此要求，請勿理會本郵件。"; diff --git a/main/lang/turkish/trad4all.inc.php b/main/lang/turkish/trad4all.inc.php index 95b3287e55..be44cd3ed5 100644 --- a/main/lang/turkish/trad4all.inc.php +++ b/main/lang/turkish/trad4all.inc.php @@ -2229,7 +2229,7 @@ $NewMessageInForum = "Yeni Mesaj"; $FolderCreated = "Yeni klasör oluşturuldu"; $AgendaAdded = "Ajandaya eklendi"; $ShouldBeCSVFormat = "Dosya CSV formatında olmalıdır.Boşluk bırakmayın, yapı kesinlikle şu şekilde olmalıdır:"; -$Enter2passToChange = "Şifre değişikliği için yeni şifrenizi iki kere girmelisiniz, aksi taktirde bu alanı boş bırakınız."; +$TypeCurrentPassword = "Şifre değişikliği için yeni şifrenizi iki kere girmelisiniz, aksi taktirde bu alanı boş bırakınız."; $AuthInfo = "Giriş"; $ImageWrong = "Dosya boyutunun olabileceği büyüklük:"; $NewPass = "Yeni şifre"; From b080daa43ab6b20ac43e5599d5433c8c6bc76d4e Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 4 Sep 2019 11:05:42 +0200 Subject: [PATCH 06/10] Fix redirect from course base to course session only for students BT#16000 --- main/inc/local.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php index 77d2d5d9e0..90d4bf085d 100755 --- a/main/inc/local.inc.php +++ b/main/inc/local.inc.php @@ -1350,8 +1350,7 @@ if ((isset($uidReset) && $uidReset) || $cidReset) { // User has not access to the course // This will check if the course was added in one of his sessions // Then it will be redirected to that course-session - - if ($is_courseMember == false) { + if ($is_courseMember === false && $is_platformAdmin === false) { // Search session $courseSession = SessionManager::searchCourseInSessionsFromUser( $user_id, From a41b1aa476b49e647e62f7254d60d96444474083 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 4 Sep 2019 11:40:20 +0200 Subject: [PATCH 07/10] Allow student to see recording see BT#16008 --- plugin/bbb/lib/bbb.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php index cd8d3458d2..4055cb0a50 100755 --- a/plugin/bbb/lib/bbb.lib.php +++ b/plugin/bbb/lib/bbb.lib.php @@ -802,9 +802,9 @@ class bbb $this->updateMeetingVideoUrl($meetingDB['id'], $record['playbackFormatUrl']); } - if (!$this->isConferenceManager()) { + /*if (!$this->isConferenceManager()) { $record = []; - } + }*/ } } From 9076905d7cc4cac0af59819f648f1cdef57ce97b Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 4 Sep 2019 11:40:33 +0200 Subject: [PATCH 08/10] Minor - format code --- plugin/bbb/view/listing.tpl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugin/bbb/view/listing.tpl b/plugin/bbb/view/listing.tpl index 167b406fa6..c8f44308a0 100644 --- a/plugin/bbb/view/listing.tpl +++ b/plugin/bbb/view/listing.tpl @@ -1,4 +1,4 @@ -