fixed some missing translations caused by the merge conflict

framework/LoginDialog/LoginDialog.bbj

@@ -187,15 +187,16 @@ class public LoginDialog
             if #passwordValidator! = null() then #passwordValidator! = new PasswordValidator()
 
             LoginDialogBuilder.addUsernameInput(wnd!, new UsernameValidator(), user$)
-            LoginDialogBuilder.addPasswordInput(wnd!, new PasswordValidator(), I18n.getTranslation("password"), I18n.getTranslation("your-password"))
+            LoginDialogBuilder.addPasswordInput(wnd!, new PasswordValidator(), I18n.getTranslation("password-upper"), I18n.getTranslation("your-password"))
         else
             LoginDialogBuilder.addUsernameInput(wnd!, null(), user$)
             LoginDialogBuilder.addPasswordInput(wnd!, null(), I18n.getTranslation("password"), I18n.getTranslation("your-password"))
         fi
 
-        if #AllowRemember! = Boolean.TRUE then LoginDialogBuilder.addRememberMeBox(wnd!) then
-            LoginDialogBuilder.addSubmitButton(wnd!, I18n.getTranslation("login-upper"), I18n.getTranslation("login"))
+        if #AllowRemember!  then 
+            LoginDialogBuilder.addRememberMeBox(wnd!)
         fi
+        LoginDialogBuilder.addSubmitButton(wnd!, I18n.getTranslation("login-upper"), I18n.getTranslation("login"))
 
         if #getLoginWithGoogle() OR #getLoginWithMicrosoft() then
             LoginDialogBuilder.addSSOZone(wnd!)

framework/LoginDialog/LoginDialogBuilder.bbj

@@ -87,14 +87,16 @@ class public LoginDialogBuilder extends BBjWidget
     methodend
 
     method public static void addRememberMeBox(LoginDialogWindow dialog!)
-        dialog!.setRememberMe(dialog!.getContent().addCheckBox(dialog!.getContent().getAvailableControlID(),0,0,0,0,I18n.getTranslation("keep-mesigned-in"))
-        dialog!.getRememberMe().setStyle("margin-top","20px")
-        dialog!.getRememberMe().setStyle("margin-bottom","20px")
-
-        dialog!.getRememberMe().addStyle("loginWidgetCheckBoxStyle")
-        dialog!.getRememberMe().addStyle("loginWidgetCheckBoxLabel")
-        dialog!.getRememberMe().addStyle("loginWidgetCheckBoxInputWrapper")
-        dialog!.getRememberMe().addStyle("loginWidgetCheckBoxControl")
+    rem content! = 
+    content! = dialog!.getContent()
+    dialog!.setRememberMe(content!.addCheckBox(content!.getAvailableControlID(),0,0,0,0,I18n.getTranslation("keep-mesigned-in")))
+    dialog!.getRememberMe().setStyle("margin-top","20px")
+    dialog!.getRememberMe().setStyle("margin-bottom","20px")
+
+    dialog!.getRememberMe().addStyle("loginWidgetCheckBoxStyle")
+    dialog!.getRememberMe().addStyle("loginWidgetCheckBoxLabel")
+    dialog!.getRememberMe().addStyle("loginWidgetCheckBoxInputWrapper")
+    dialog!.getRememberMe().addStyle("loginWidgetCheckBoxControl")
     methodend
 
     method public static void addSubmitButton(LoginDialogWindow dialog!, BBjString label$)

i18n/webkit.properties

@@ -1,17 +1,17 @@
 #
-#Tue Dec 14 17:43:53 CET 2021
-login-upper=Login
-username-upper=Username
+#Thu Dec 16 15:25:15 CET 2021
 choose-a-new-password=Choose a new password
 forgot-your-password=Forgot your Password?
 it-seems-you-cannot-use-this-functionality=It seems you cannot use this functionality.
 keep-mesigned-in=Keep me signed in
 login=login
+login-upper=Login
 name-company-com=name@company.com
 new-password=New Password
 password=password
 password-been-changed=Password has been changed
 password-token-sent=Password token sent
+password-upper=Password
 repeat-password=Repeat Password
 request-a-new-password=Request a new password
 retry=Retry
@@ -20,5 +20,6 @@ send-email=Send Email
 set-password=Set Password
 something-went-wrong=Something went wrong
 user=user
+username-upper=Username
 you-may-now-login-with-your-new-user-credentials=You may now log in with your new user credentials.
 your-password=your password

i18n/webkit_de.properties

@@ -1,24 +1,25 @@
 #
-#Tue Dec 14 17:43:53 CET 2021
-login-upper=Login
-username-upper=Benutzername
+#Thu Dec 16 15:25:15 CET 2021
 choose-a-new-password=W\u00E4hlen Sie ein neues Passwort
 forgot-your-password=Passwort vergessen?
 it-seems-you-cannot-use-this-functionality=Es scheint, dass Sie diese Funktion nicht nutzen k\u00F6nnen.
 keep-mesigned-in=Angemeldet bleiben
 login=anmelden
+login-upper=Login
 name-company-com=name@firma.com
 new-password=Neues Password
 password=Passwort
 password-been-changed=Das Passwort wurde ge\u00E4ndert
 password-token-sent=Das Passwort-Token wurde gesendet
+password-upper=Passwort
 repeat-password=Passwort wiederholen
 request-a-new-password=Ein neues Passwort anfordern
 retry=Erneut versuchen
-return-to-login=Zurück zum Login
+return-to-login=Zur\u00C3\u00BCck zum Login
 send-email=E-Mail senden
 set-password=Passwort festlegen
 something-went-wrong=Etwas ist schief gelaufen
 user=Benutzer
+username-upper=Benutzername
 you-may-now-login-with-your-new-user-credentials=Sie k\u00F6nnen sich nun mit Ihren neuen Benutzerdaten anmelden.
 your-password=dein Passwort

i18n/webkit_en.properties

@@ -1,17 +1,17 @@
 #
-#Tue Dec 14 17:59:53 CET 2021
-login-upper=Login
-username-upper=Username
+#Thu Dec 16 15:25:15 CET 2021
 choose-a-new-password=Choose a new password
 forgot-your-password=Forgot your Password?
 it-seems-you-cannot-use-this-functionality=It seems you cannot use this functionality.
 keep-mesigned-in=Keep me signed in
 login=login
+login-upper=Login
 name-company-com=name@company.com
 new-password=New Password
 password=password
 password-been-changed=Password has been changed
 password-token-sent=Password token sent
+password-upper=Password
 repeat-password=Repeat Password
 request-a-new-password=Request a new password
 retry=Retry
@@ -20,5 +20,6 @@ send-email=Send Email
 set-password=Set Password
 something-went-wrong=Something went wrong
 user=user
+username-upper=Username
 you-may-now-login-with-your-new-user-credentials=You may now log in with your new user credentials.
 your-password=your password