Skip to content

Commit be08734

Browse files
dbuecheldbuechel
committed
SEBWIN-985, #1028: Added missing translations and minor changes.
1 parent d492746 commit be08734

13 files changed

Lines changed: 44 additions & 17 deletions

File tree

‎SafeExamBrowser.Client/Responsibilities/MonitoringResponsibility.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -254,18 +254,18 @@ private void Sentinel_EaseOfAccessChanged(SentinelEventArgs args)
254254

255255
private void Sentinel_SessionChanged(SessionSwitchReason reason)
256256
{
257-
258-
var allow = !Settings.Service.IgnoreService && (!Settings.Service.DisableUserLock || !Settings.Service.DisableUserSwitch);
259-
var disable = Settings.Security.DisableSessionChangeLockScreen;
260-
var isSessionLockEvent = reason == SessionSwitchReason.SessionLock;
261-
var isSessionUnlockEvent = reason == SessionSwitchReason.SessionUnlock;
262-
if (allow || disable)
257+
258+
var allowed = !Settings.Service.IgnoreService && (!Settings.Service.DisableUserLock || !Settings.Service.DisableUserSwitch);
259+
var disabled = Settings.Security.DisableSessionChangeLockScreen;
260+
var ignore = Settings.Service.IgnoreService && (reason == SessionSwitchReason.SessionLock || reason == SessionSwitchReason.SessionUnlock);
261+
262+
if (allowed || disabled)
263263
{
264-
Logger.Info($"Detected user session change, but {(allow ? "session locking and/or switching is allowed" : "lock screen is deactivated")}.");
264+
Logger.Info($"Detected user session change ({reason}), but {(allowed ? "session locking and/or switching is allowed" : "lock screen is disabled")}.");
265265
}
266-
else if (Settings.Service.IgnoreService && (isSessionLockEvent || isSessionUnlockEvent))
266+
else if (ignore)
267267
{
268-
Logger.Info($"Detected user session {(isSessionLockEvent ? "lock" : "unlock")}, ignoring!");
268+
Logger.Info($"Ignoring user session change ({reason}).");
269269
}
270270
else
271271
{
@@ -274,7 +274,7 @@ private void Sentinel_SessionChanged(SessionSwitchReason reason)
274274
var continueOption = new LockScreenOption { Text = text.Get(TextKey.LockScreen_UserSessionContinueOption) };
275275
var terminateOption = new LockScreenOption { Text = text.Get(TextKey.LockScreen_UserSessionTerminateOption) };
276276

277-
Logger.Warn("User session changed! Attempting to show lock screen...");
277+
Logger.Warn($"User session changed ({reason})! Attempting to show lock screen...");
278278

279279
if (coordinator.RequestSessionLock())
280280
{

‎SafeExamBrowser.I18n.Contracts/TextKey.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ public enum TextKey
9090
LockScreen_UnlockButton,
9191
LockScreen_UserSessionContinueOption,
9292
LockScreen_UserSessionMessage,
93-
LockScreen_UserSwitchMessage,
9493
LockScreen_UserSessionTerminateOption,
94+
LockScreen_UserSwitchMessage,
9595
LogWindow_AlwaysOnTop,
9696
LogWindow_AutoScroll,
9797
LogWindow_Title,

‎SafeExamBrowser.I18n/Data/de.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@
228228
<Entry key="LockScreen_UserSessionMessage">
229229
Der aktive Benutzer hat sich geändert oder der Computer wurde gesperrt! Bitte wählen Sie eine der verfügbaren Optionen aus und geben Sie das korrekte Passwort ein, um SEB zu entsperren.
230230
</Entry>
231-
<Entry key="LockScreen_UserSwitchMessage">
232-
Der aktive Benutzer hat sich geändert! Bitte wählen Sie eine der verfügbaren Optionen aus und geben Sie das korrekte Passwort ein, um SEB zu entsperren.
233-
</Entry>
234231
<Entry key="LockScreen_UserSessionTerminateOption">
235232
Safe Exam Browser beenden. WARNUNG: Sie werden keine Möglichkeit haben, Daten zu speichern oder weitere Aktionen auszuführen, SEB wird sofort beendet!
236233
</Entry>
234+
<Entry key="LockScreen_UserSwitchMessage">
235+
Der aktive Benutzer hat sich geändert! Bitte wählen Sie eine der verfügbaren Optionen aus und geben Sie das korrekte Passwort ein, um SEB zu entsperren.
236+
</Entry>
237237
<Entry key="LogWindow_AlwaysOnTop">
238238
Immer zuoberst
239239
</Entry>

‎SafeExamBrowser.I18n/Data/en.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@
228228
<Entry key="LockScreen_UserSessionMessage">
229229
The active user has changed or the computer has been locked! In order to unlock SEB, please select one of the available options and enter the correct unlock password.
230230
</Entry>
231-
<Entry key="LockScreen_UserSwitchMessage">
232-
The active user has changed. In order to unlock SEB, please select one of the available options and enter the correct unlock password.
233-
</Entry>
234231
<Entry key="LockScreen_UserSessionTerminateOption">
235232
Terminate Safe Exam Browser. WARNING: There will be no possibility to save data or perform any further actions, the shutdown will be initiated immediately!
236233
</Entry>
234+
<Entry key="LockScreen_UserSwitchMessage">
235+
The active user has changed! In order to unlock SEB, please select one of the available options and enter the correct unlock password.
236+
</Entry>
237237
<Entry key="LogWindow_AlwaysOnTop">
238238
Always on top
239239
</Entry>

‎SafeExamBrowser.I18n/Data/es.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@
231231
<Entry key="LockScreen_UserSessionTerminateOption">
232232
Finalizar Safe Exam Browser. ADVERTENCIA: No habrá posibilidad de guardar datos o realizar ninguna otra acción, ¡el cierre se iniciará inmediatamente!
233233
</Entry>
234+
<Entry key="LockScreen_UserSwitchMessage">
235+
¡El usuario activo ha cambiado! Para desbloquear SEB, seleccione una de las opciones disponibles e introduzca la contraseña de desbloqueo correcta.
236+
</Entry>
234237
<Entry key="LogWindow_AlwaysOnTop">
235238
Siempre arriba
236239
</Entry>

‎SafeExamBrowser.I18n/Data/et.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@
231231
<Entry key="LockScreen_UserSessionTerminateOption">
232232
Sulge Safe Exam Browser. HOIATUS: andmete salvestamise ega edasiste toimingute tegemise võimalust ei ole, sulgemine käivitatakse kohe!
233233
</Entry>
234+
<Entry key="LockScreen_UserSwitchMessage">
235+
Aktiivne kasutaja on muutunud! SEB avamiseks valige üks olemasolevatest võimalustest ja sisestage õige avamisparool.
236+
</Entry>
234237
<Entry key="LogWindow_AlwaysOnTop">
235238
Alati peal
236239
</Entry>

‎SafeExamBrowser.I18n/Data/fr.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@
231231
<Entry key="LockScreen_UserSessionTerminateOption">
232232
Terminer Safe Exam Browser. AVERTISSEMENT: Il n'y aura aucune possibilité de sauvegarder les données ou d'effectuer d'autres actions, la fermeture sera initiée immédiatement!
233233
</Entry>
234+
<Entry key="LockScreen_UserSwitchMessage">
235+
L'utilisateur actif a changé! Afin de déverrouiller SEB, veuillez sélectionner une des options disponibles et entrer le mot de passe de déverrouillage.
236+
</Entry>
234237
<Entry key="LogWindow_AlwaysOnTop">
235238
Toujours au premier plan
236239
</Entry>

‎SafeExamBrowser.I18n/Data/id.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@
231231
<Entry key="LockScreen_UserSessionTerminateOption">
232232
Menghentikan Safe Exam Browser. PERINGATAN: Tidak akan ada kemungkinan untuk menyimpan data atau melakukan tindakan lebih lanjut, penghentian akan segera dilakukan!
233233
</Entry>
234+
<Entry key="LockScreen_UserSwitchMessage">
235+
Pengguna aktif telah berubah! Untuk membuka kunci SEB, pilih salah satu opsi yang tersedia dan masukkan kata sandi buka kunci yang benar.
236+
</Entry>
234237
<Entry key="LogWindow_AlwaysOnTop">
235238
Selalu di atas
236239
</Entry>

‎SafeExamBrowser.I18n/Data/it.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@
231231
<Entry key="LockScreen_UserSessionTerminateOption">
232232
Terminare Safe Exam Browser. ATTENZIONE: Non sarà possibile salvare i dati o eseguire ulteriori azioni, la chiusura verrà avviata immediatamente!
233233
</Entry>
234+
<Entry key="LockScreen_UserSwitchMessage">
235+
L'utente attivo è cambiato! Per sbloccare SEB, seleziona una delle opzioni disponibili e inserisci la password di sblocco corretta.
236+
</Entry>
234237
<Entry key="LogWindow_AlwaysOnTop">
235238
Sempre in cima
236239
</Entry>

‎SafeExamBrowser.I18n/Data/nl.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@
231231
<Entry key="LockScreen_UserSessionTerminateOption">
232232
Beëindig de Safe Exam Browser. WAARSCHUWING: er is geen mogelijkheid om gegevens op te slaan of verdere acties uit te voeren, de browser wordt onmiddellijk afgesloten!
233233
</Entry>
234+
<Entry key="LockScreen_UserSwitchMessage">
235+
De actieve gebruiker is gewijzigd! Om SEB te ontgrendelen, selecteert u een van de beschikbare opties en voert u het juiste ontgrendelwachtwoord in.
236+
</Entry>
234237
<Entry key="LogWindow_AlwaysOnTop">
235238
Altijd bovenaan
236239
</Entry>

0 commit comments

Comments
 (0)