From 5950a810632d770d9b0526d4afbffe30990db63f Mon Sep 17 00:00:00 2001
From: George Nash <bobcaprice@hotmail.com>
Date: Wed, 10 Jan 2024 16:57:37 +0000
Subject: [PATCH 01/19] password reset finish base

---
 ui/src/app/account/account.module.ts          |  4 +-
 .../account/model/key-validation-result.ts    | 14 +++
 .../model/resend-activation-email-result.ts   | 11 +++
 .../password-reset-finish.component.html      | 96 +++++++++++++++++++
 .../password-reset-finish.component.scss      |  0
 .../password-reset-finish.component.spec.ts   | 21 ++++
 .../password-reset-finish.component.ts        | 85 ++++++++++++++++
 .../app/account/service/password.service.ts   | 21 +++-
 8 files changed, 249 insertions(+), 3 deletions(-)
 create mode 100644 ui/src/app/account/model/key-validation-result.ts
 create mode 100644 ui/src/app/account/model/resend-activation-email-result.ts
 create mode 100644 ui/src/app/account/password/password-reset-finish.component.html
 create mode 100644 ui/src/app/account/password/password-reset-finish.component.scss
 create mode 100644 ui/src/app/account/password/password-reset-finish.component.spec.ts
 create mode 100644 ui/src/app/account/password/password-reset-finish.component.ts

diff --git a/ui/src/app/account/account.module.ts b/ui/src/app/account/account.module.ts
index e4ee6c1e4..af6d657e2 100644
--- a/ui/src/app/account/account.module.ts
+++ b/ui/src/app/account/account.module.ts
@@ -8,7 +8,8 @@ import { PasswordResetInitComponent } from './password/password-reset-init.compo
 import { SettingsComponent } from './settings/settings.component'
 import { SharedModule } from '../shared/shared.module'
 import { PasswordComponent } from './password/password.component'
-import { PasswordStrengthComponent } from './password/password-strength.component'
+import { PasswordStrengthComponent } from './password/password-strength.component';
+import { PasswordResetFinishComponent } from './password/password-reset-finish.component'
 
 @NgModule({
   declarations: [
@@ -17,6 +18,7 @@ import { PasswordStrengthComponent } from './password/password-strength.componen
     SettingsComponent,
     PasswordComponent,
     PasswordStrengthComponent,
+    PasswordResetFinishComponent,
   ],
   imports: [SharedModule, CommonModule, ReactiveFormsModule, RouterModule.forChild(routes)],
 })
diff --git a/ui/src/app/account/model/key-validation-result.ts b/ui/src/app/account/model/key-validation-result.ts
new file mode 100644
index 000000000..cae7d3713
--- /dev/null
+++ b/ui/src/app/account/model/key-validation-result.ts
@@ -0,0 +1,14 @@
+export interface IKeyValidationResult {
+  expiredKey: boolean
+  invalidKey: boolean
+}
+
+export class KeyValidationResult implements IKeyValidationResult {
+  expiredKey: boolean
+  invalidKey: boolean
+
+  constructor(expiredKey: boolean, invalidKey: boolean) {
+    this.expiredKey = expiredKey
+    this.invalidKey = invalidKey
+  }
+}
diff --git a/ui/src/app/account/model/resend-activation-email-result.ts b/ui/src/app/account/model/resend-activation-email-result.ts
new file mode 100644
index 000000000..643e15c25
--- /dev/null
+++ b/ui/src/app/account/model/resend-activation-email-result.ts
@@ -0,0 +1,11 @@
+export interface IResendActivationEmailResult {
+  resent: boolean
+}
+
+export class ResendActivationEmailResult implements IResendActivationEmailResult {
+  resent: boolean
+
+  constructor(resent: boolean) {
+    this.resent = resent
+  }
+}
diff --git a/ui/src/app/account/password/password-reset-finish.component.html b/ui/src/app/account/password/password-reset-finish.component.html
new file mode 100644
index 000000000..0a6ed679d
--- /dev/null
+++ b/ui/src/app/account/password/password-reset-finish.component.html
@@ -0,0 +1,96 @@
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <h1 jhiTranslate="reset.finish.title.string">Reset password</h1>
+
+            <div class="alert alert-danger" jhiTranslate="reset.finish.messages.keymissing.string" *ngIf="keyMissing">
+                <strong>The activation key is missing.</strong>
+            </div>
+            
+            <div class="alert alert-danger" jhiTranslate="reset.finish.messages.keyinvalid.string" *ngIf="invalidKey">
+                <strong>This activation key is invalid.</strong>
+            </div>
+            
+            <div class="alert alert-danger" jhiTranslate="reset.finish.messages.keyexpired.string" *ngIf="expiredKey">
+                <strong>This activation has expired.</strong>
+            </div>
+            <div *ngIf="expiredKey">
+                <p>
+                  <span jhiTranslate="reset.finish.messages.keyexpired.paragraph1.string">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</span>
+                </p>
+                <p>
+                  <span *ngIf="activationEmailResent" jhiTranslate="reset.finish.messages.keyexpired.paragraph2.string">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</span>
+                </p>
+                <p>
+                  <span *ngIf="activationEmailResent" jhiTranslate="reset.finish.messages.keyexpired.paragraph3.string">If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</span>
+                </p>
+            </div>
+
+            <div class="alert alert-warning" *ngIf="!success && !keyMissing && !expiredKey && !invalidKey">
+                <p jhiTranslate="reset.finish.messages.info.string">Choose a new password</p>
+            </div>
+
+            <div class="alert alert-danger" *ngIf="error">
+                <p jhiTranslate="reset.finish.messages.error.string">Your password couldn't be reset. Remember a password request is only valid for 24 hours.</p>
+            </div>
+
+            <p class="alert alert-success" *ngIf="success">
+                <span jhiTranslate="reset.finish.messages.success.string"><strong>Your password has been reset.</strong> Please </span>
+                <a class="alert-link" (click)="login()" jhiTranslate="global.messages.info.authenticated.link.string">sign in</a>.
+            </p>
+
+            <div class="alert alert-danger" *ngIf="doNotMatch" jhiTranslate="global.messages.error.dontmatch.string">
+                The password and its confirmation do not match!
+            </div>
+
+            <div *ngIf="!keyMissing && showPasswordForm">
+                <form *ngIf="!success" name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
+                    <div class="form-group">
+                        <label class="form-control-label" for="password" jhiTranslate="global.form.newpassword.label.string">New password</label>
+                        <input type="password" class="form-control" id="password" name="password"
+                               placeholder="{{'global.form.newpassword.placeholder.string' | translate}}"
+                               formControlName="newPassword">
+                        <div *ngIf="passwordForm.get('newPassword').invalid && (passwordForm.get('newPassword').dirty || passwordForm.get('newPassword').touched)">
+                            <small class="form-text text-danger"
+                               *ngIf="passwordForm.get('newPassword').errors.required" jhiTranslate="global.messages.validate.newpassword.required.string">
+                                Your password is required.
+                            </small>
+                            <small class="form-text text-danger"
+                               *ngIf="passwordForm.get('newPassword').errors.minlength" jhiTranslate="global.messages.validate.newpassword.minlength.string">
+                                Your password is required to be at least 4 characters.
+                            </small>
+                            <small class="form-text text-danger"
+                               *ngIf="passwordForm.get('newPassword').errors.maxlength" jhiTranslate="global.messages.validate.newpassword.maxlength.string">
+                                Your password cannot be longer than 50 characters.
+                            </small>
+                        </div>
+                        <jhi-password-strength-bar [passwordToCheck]="passwordForm.get('newPassword').value"></jhi-password-strength-bar>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="form-control-label" for="confirmPassword" jhiTranslate="global.form.confirmpassword.label.string">New password confirmation</label>
+                        <input type="password" class="form-control" id="confirmPassword" name="confirmPassword"
+                               placeholder="{{'global.form.confirmpassword.placeholder.string' | translate}}"
+                               formControlName="confirmPassword">
+                        <div *ngIf="passwordForm.get('confirmPassword').invalid && (passwordForm.get('confirmPassword').dirty || passwordForm.get('confirmPassword').touched)">
+                            <small class="form-text text-danger"
+                               *ngIf="passwordForm.get('confirmPassword').errors.required" jhiTranslate="global.messages.validate.confirmpassword.required.string">
+                                Your password confirmation is required.
+                            </small>
+                            <small class="form-text text-danger"
+                               *ngIf="passwordForm.get('confirmPassword').errors.minlength" jhiTranslate="global.messages.validate.confirmpassword.minlength.string">
+                                Your password confirmation is required to be at least 4 characters.
+                            </small>
+                            <small class="form-text text-danger"
+                               *ngIf="passwordForm.get('confirmPassword').errors.maxlength" jhiTranslate="global.messages.validate.confirmpassword.maxlength.string">
+                                Your password confirmation cannot be longer than 50 characters.
+                            </small>
+                        </div>
+                    </div>
+                    <button type="submit" [disabled]="passwordForm.invalid" class="btn btn-primary" jhiTranslate="reset.finish.form.button.string">Reset Password</button>
+                </form>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/ui/src/app/account/password/password-reset-finish.component.scss b/ui/src/app/account/password/password-reset-finish.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/src/app/account/password/password-reset-finish.component.spec.ts b/ui/src/app/account/password/password-reset-finish.component.spec.ts
new file mode 100644
index 000000000..7b8bbd274
--- /dev/null
+++ b/ui/src/app/account/password/password-reset-finish.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PasswordResetFinishComponent } from './password-reset-finish.component';
+
+describe('PasswordResetFinishComponent', () => {
+  let component: PasswordResetFinishComponent;
+  let fixture: ComponentFixture<PasswordResetFinishComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [PasswordResetFinishComponent]
+    });
+    fixture = TestBed.createComponent(PasswordResetFinishComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/ui/src/app/account/password/password-reset-finish.component.ts b/ui/src/app/account/password/password-reset-finish.component.ts
new file mode 100644
index 000000000..0d0608c65
--- /dev/null
+++ b/ui/src/app/account/password/password-reset-finish.component.ts
@@ -0,0 +1,85 @@
+import { PasswordService } from '../service/password.service'
+import { Component, OnInit, AfterViewInit, Renderer2, ElementRef } from '@angular/core'
+import { FormBuilder, FormGroup, Validators } from '@angular/forms'
+import { ActivatedRoute, Router } from '@angular/router'
+
+import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
+
+@Component({
+  selector: 'app-password-reset-finish',
+  templateUrl: './password-reset-finish.component.html',
+  styleUrls: ['./password-reset-finish.component.scss'],
+})
+export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
+  doNotMatch: string
+  error: string
+  keyMissing: boolean
+  success: string
+  modalRef: NgbModalRef
+  key: string
+  invalidKey: boolean
+  expiredKey: boolean
+  activationEmailResent: boolean
+  showPasswordForm: boolean
+
+  passwordForm = this.fb.group({
+    newPassword: ['', [Validators.required, Validators.minLength(4), Validators.maxLength(50)]],
+    confirmPassword: ['', [Validators.required, Validators.minLength(4), Validators.maxLength(50)]],
+  })
+
+  constructor(
+    private passwordService: PasswordService,
+    private route: ActivatedRoute,
+    private elementRef: ElementRef,
+    private renderer: Renderer2,
+    private fb: FormBuilder,
+    private router: Router
+  ) {}
+
+  ngOnInit() {
+    this.route.queryParams.subscribe((params) => {
+      this.key = params['key']
+    })
+    this.keyMissing = !this.key
+    this.passwordService.validateKey({ key: this.key }).subscribe((res) => {
+      this.expiredKey = res.expiredKey
+      this.invalidKey = res.invalidKey
+      this.showPasswordForm = !this.invalidKey && !this.expiredKey
+      if (this.expiredKey) {
+        this.passwordService.resendActivationEmail({ key: this.key }).subscribe((result) => {
+          this.activationEmailResent = result.resent
+        })
+      }
+    })
+  }
+
+  ngAfterViewInit() {
+    if (this.elementRef.nativeElement.querySelector('#password') != null) {
+      this.renderer.selectRootElement('#password').scrollIntoView()
+    }
+  }
+
+  finishReset() {
+    this.doNotMatch = null
+    this.error = null
+    const password = this.passwordForm.get(['newPassword']).value
+    const confirmPassword = this.passwordForm.get(['confirmPassword']).value
+    if (password !== confirmPassword) {
+      this.doNotMatch = 'ERROR'
+    } else {
+      this.passwordResetFinishService.save({ key: this.key, newPassword: password }).subscribe(
+        () => {
+          this.success = 'OK'
+        },
+        () => {
+          this.success = null
+          this.error = 'ERROR'
+        }
+      )
+    }
+  }
+
+  login() {
+    this.router.navigate(['/login'])
+  }
+}
diff --git a/ui/src/app/account/service/password.service.ts b/ui/src/app/account/service/password.service.ts
index 6c7b8fbb6..428f1f935 100644
--- a/ui/src/app/account/service/password.service.ts
+++ b/ui/src/app/account/service/password.service.ts
@@ -3,6 +3,8 @@ import { HttpClient, HttpResponse } from '@angular/common/http'
 import { Observable, map, catchError, of } from 'rxjs'
 import { PasswordResetInitResult } from '../model/password-reset-init-result.model'
 import { EMAIL_NOT_FOUND_TYPE } from 'src/app/app.constants'
+import { KeyValidationResult } from '../model/key-validation-result'
+import { ResendActivationEmailResult } from '../model/resend-activation-email-result'
 
 @Injectable({ providedIn: 'root' })
 export class PasswordService {
@@ -10,7 +12,7 @@ export class PasswordService {
 
   initPasswordReset(mail: string): Observable<PasswordResetInitResult | null> {
     return this.http.post('/services/userservice/api/account/reset-password/init', mail, { observe: 'response' }).pipe(
-      map((res: HttpResponse<any>) => this.getResult(res)),
+      map((res: HttpResponse<any>) => this.getPasswordResetResult(res)),
       catchError((err) => {
         return of(null)
       })
@@ -24,7 +26,22 @@ export class PasswordService {
     })
   }
 
-  getResult(res: HttpResponse<any>): PasswordResetInitResult {
+  save(keyAndPassword: any): Observable<any> {
+    return this.http.post('/services/userservice/api/account/reset-password/finish', keyAndPassword)
+  }
+
+  validateKey(key: any): Observable<KeyValidationResult> {
+    return this.http.post<KeyValidationResult>('/services/userservice/api/account/reset-password/validate', key)
+  }
+
+  resendActivationEmail(key: any): Observable<ResendActivationEmailResult> {
+    return this.http.post<ResendActivationEmailResult>(
+      '/services/userservice/api/users/' + key.key + '/resendActivation',
+      {}
+    )
+  }
+
+  getPasswordResetResult(res: HttpResponse<any>): PasswordResetInitResult {
     if (res.status == 200) {
       return new PasswordResetInitResult(true, false, false)
     }

From 869e926d7e5da921916aa56d27cf83a01a1e9e56 Mon Sep 17 00:00:00 2001
From: George Nash <bobcaprice@hotmail.com>
Date: Wed, 10 Jan 2024 17:01:34 +0000
Subject: [PATCH 02/19] renamed save method for clarity

---
 ui/src/app/account/password/password-reset-finish.component.ts | 2 +-
 ui/src/app/account/service/password.service.ts                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/account/password/password-reset-finish.component.ts b/ui/src/app/account/password/password-reset-finish.component.ts
index 0d0608c65..bb04fc943 100644
--- a/ui/src/app/account/password/password-reset-finish.component.ts
+++ b/ui/src/app/account/password/password-reset-finish.component.ts
@@ -67,7 +67,7 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
     if (password !== confirmPassword) {
       this.doNotMatch = 'ERROR'
     } else {
-      this.passwordResetFinishService.save({ key: this.key, newPassword: password }).subscribe(
+      this.passwordService.savePassword({ key: this.key, newPassword: password }).subscribe(
         () => {
           this.success = 'OK'
         },
diff --git a/ui/src/app/account/service/password.service.ts b/ui/src/app/account/service/password.service.ts
index 428f1f935..f64f82c26 100644
--- a/ui/src/app/account/service/password.service.ts
+++ b/ui/src/app/account/service/password.service.ts
@@ -26,7 +26,7 @@ export class PasswordService {
     })
   }
 
-  save(keyAndPassword: any): Observable<any> {
+  savePassword(keyAndPassword: any): Observable<any> {
     return this.http.post('/services/userservice/api/account/reset-password/finish', keyAndPassword)
   }
 

From 48ae5c9437242194daf988594f6350e8b50c8493 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Thu, 11 Jan 2024 17:24:32 +0200
Subject: [PATCH 03/19] remove unnecessary scss files

---
 ui/src/app/account/password/password-reset-finish.component.scss | 0
 ui/src/app/account/password/password.component.scss              | 0
 ui/src/app/account/password/password.component.ts                | 1 -
 3 files changed, 1 deletion(-)
 delete mode 100644 ui/src/app/account/password/password-reset-finish.component.scss
 delete mode 100644 ui/src/app/account/password/password.component.scss

diff --git a/ui/src/app/account/password/password-reset-finish.component.scss b/ui/src/app/account/password/password-reset-finish.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/src/app/account/password/password.component.scss b/ui/src/app/account/password/password.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/src/app/account/password/password.component.ts b/ui/src/app/account/password/password.component.ts
index 909205d8c..20690de46 100644
--- a/ui/src/app/account/password/password.component.ts
+++ b/ui/src/app/account/password/password.component.ts
@@ -6,7 +6,6 @@ import { AccountService } from '../service/account.service'
 @Component({
   selector: 'app-password',
   templateUrl: './password.component.html',
-  styleUrls: ['./password.component.scss'],
 })
 export class PasswordComponent implements OnInit {
   doNotMatch: string | undefined

From cd22361f651a174978deb4e3453a7b36e329cee6 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Thu, 11 Jan 2024 17:24:55 +0200
Subject: [PATCH 04/19] correct margin to visually match the old app

---
 ui/src/app/account/password/password-strength.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/account/password/password-strength.component.scss b/ui/src/app/account/password/password-strength.component.scss
index 88af5f5ef..eb570f9c1 100644
--- a/ui/src/app/account/password/password-strength.component.scss
+++ b/ui/src/app/account/password/password-strength.component.scss
@@ -12,7 +12,7 @@ ul#strength {
     border-radius: 2px;
     display: inline-block;
     height: 5px;
-    margin-right: 1px;
+    margin-right: 5px;
     width: 20px;
     &:last-child {
       margin: 0 !important;

From ad87d7477ae0dfc8c262d4c371c3c69943c5bc36 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Thu, 11 Jan 2024 17:25:34 +0200
Subject: [PATCH 05/19] make compatible with new app

---
 .../password-reset-finish.component.html      | 231 +++++++++++-------
 .../password-reset-finish.component.ts        |  39 ++-
 2 files changed, 165 insertions(+), 105 deletions(-)

diff --git a/ui/src/app/account/password/password-reset-finish.component.html b/ui/src/app/account/password/password-reset-finish.component.html
index 0a6ed679d..7f7494bf2 100644
--- a/ui/src/app/account/password/password-reset-finish.component.html
+++ b/ui/src/app/account/password/password-reset-finish.component.html
@@ -1,96 +1,159 @@
 <div class="container">
-    <div class="row">
-        <div class="col-md-12">
-            <h1 jhiTranslate="reset.finish.title.string">Reset password</h1>
+  <div class="row">
+    <div class="col-md-12">
+      <h1 i18n="@@reset.finish.title.string">Reset password</h1>
 
-            <div class="alert alert-danger" jhiTranslate="reset.finish.messages.keymissing.string" *ngIf="keyMissing">
-                <strong>The activation key is missing.</strong>
-            </div>
-            
-            <div class="alert alert-danger" jhiTranslate="reset.finish.messages.keyinvalid.string" *ngIf="invalidKey">
-                <strong>This activation key is invalid.</strong>
-            </div>
-            
-            <div class="alert alert-danger" jhiTranslate="reset.finish.messages.keyexpired.string" *ngIf="expiredKey">
-                <strong>This activation has expired.</strong>
-            </div>
-            <div *ngIf="expiredKey">
-                <p>
-                  <span jhiTranslate="reset.finish.messages.keyexpired.paragraph1.string">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</span>
-                </p>
-                <p>
-                  <span *ngIf="activationEmailResent" jhiTranslate="reset.finish.messages.keyexpired.paragraph2.string">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</span>
-                </p>
-                <p>
-                  <span *ngIf="activationEmailResent" jhiTranslate="reset.finish.messages.keyexpired.paragraph3.string">If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</span>
-                </p>
-            </div>
+      <div class="alert alert-danger" i18n="@@reset.finish.messages.keymissing.string" *ngIf="keyMissing">
+        <strong>The activation key is missing.</strong>
+      </div>
 
-            <div class="alert alert-warning" *ngIf="!success && !keyMissing && !expiredKey && !invalidKey">
-                <p jhiTranslate="reset.finish.messages.info.string">Choose a new password</p>
-            </div>
+      <div class="alert alert-danger" i18n="@@reset.finish.messages.keyinvalid.string" *ngIf="invalidKey">
+        <strong>This activation key is invalid.</strong>
+      </div>
 
-            <div class="alert alert-danger" *ngIf="error">
-                <p jhiTranslate="reset.finish.messages.error.string">Your password couldn't be reset. Remember a password request is only valid for 24 hours.</p>
-            </div>
+      <div class="alert alert-danger" i18n="@@reset.finish.messages.keyexpired.string" *ngIf="expiredKey">
+        <strong>This activation has expired.</strong>
+      </div>
+      <div *ngIf="expiredKey">
+        <p>
+          <span i18n="@@reset.finish.messages.keyexpired.paragraph1.string"
+            >ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has
+            expired.</span
+          >
+        </p>
+        <p>
+          <span *ngIf="activationEmailResent" i18n="@@reset.finish.messages.keyexpired.paragraph2.string"
+            >To make sure you can activate your Member Portal account we have sent a new activation link to your
+            registered email address.</span
+          >
+        </p>
+        <p>
+          <span *ngIf="activationEmailResent" i18n="@@reset.finish.messages.keyexpired.paragraph3.string"
+            >If you are still having problems activating your account or have not received your new activation link
+            please contact our support team please contact us at membership&#64;orcid.org.</span
+          >
+        </p>
+      </div>
 
-            <p class="alert alert-success" *ngIf="success">
-                <span jhiTranslate="reset.finish.messages.success.string"><strong>Your password has been reset.</strong> Please </span>
-                <a class="alert-link" (click)="login()" jhiTranslate="global.messages.info.authenticated.link.string">sign in</a>.
-            </p>
+      <div class="alert alert-warning" *ngIf="!success && !keyMissing && !expiredKey && !invalidKey">
+        <p i18n="@@reset.finish.messages.info.string">Choose a new password</p>
+      </div>
 
-            <div class="alert alert-danger" *ngIf="doNotMatch" jhiTranslate="global.messages.error.dontmatch.string">
-                The password and its confirmation do not match!
-            </div>
+      <div class="alert alert-danger" *ngIf="error">
+        <p i18n="@@reset.finish.messages.error.string">
+          Your password couldn't be reset. Remember a password request is only valid for 24 hours.
+        </p>
+      </div>
 
-            <div *ngIf="!keyMissing && showPasswordForm">
-                <form *ngIf="!success" name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
-                    <div class="form-group">
-                        <label class="form-control-label" for="password" jhiTranslate="global.form.newpassword.label.string">New password</label>
-                        <input type="password" class="form-control" id="password" name="password"
-                               placeholder="{{'global.form.newpassword.placeholder.string' | translate}}"
-                               formControlName="newPassword">
-                        <div *ngIf="passwordForm.get('newPassword').invalid && (passwordForm.get('newPassword').dirty || passwordForm.get('newPassword').touched)">
-                            <small class="form-text text-danger"
-                               *ngIf="passwordForm.get('newPassword').errors.required" jhiTranslate="global.messages.validate.newpassword.required.string">
-                                Your password is required.
-                            </small>
-                            <small class="form-text text-danger"
-                               *ngIf="passwordForm.get('newPassword').errors.minlength" jhiTranslate="global.messages.validate.newpassword.minlength.string">
-                                Your password is required to be at least 4 characters.
-                            </small>
-                            <small class="form-text text-danger"
-                               *ngIf="passwordForm.get('newPassword').errors.maxlength" jhiTranslate="global.messages.validate.newpassword.maxlength.string">
-                                Your password cannot be longer than 50 characters.
-                            </small>
-                        </div>
-                        <jhi-password-strength-bar [passwordToCheck]="passwordForm.get('newPassword').value"></jhi-password-strength-bar>
-                    </div>
+      <p class="alert alert-success" *ngIf="success">
+        <span i18n="@@reset.finish.messages.success.string"
+          ><strong>Your password has been reset.</strong> Please
+        </span>
+        <a class="alert-link" (click)="login()" i18n="@@global.messages.info.authenticated.link.string">sign in</a>.
+      </p>
 
-                    <div class="form-group">
-                        <label class="form-control-label" for="confirmPassword" jhiTranslate="global.form.confirmpassword.label.string">New password confirmation</label>
-                        <input type="password" class="form-control" id="confirmPassword" name="confirmPassword"
-                               placeholder="{{'global.form.confirmpassword.placeholder.string' | translate}}"
-                               formControlName="confirmPassword">
-                        <div *ngIf="passwordForm.get('confirmPassword').invalid && (passwordForm.get('confirmPassword').dirty || passwordForm.get('confirmPassword').touched)">
-                            <small class="form-text text-danger"
-                               *ngIf="passwordForm.get('confirmPassword').errors.required" jhiTranslate="global.messages.validate.confirmpassword.required.string">
-                                Your password confirmation is required.
-                            </small>
-                            <small class="form-text text-danger"
-                               *ngIf="passwordForm.get('confirmPassword').errors.minlength" jhiTranslate="global.messages.validate.confirmpassword.minlength.string">
-                                Your password confirmation is required to be at least 4 characters.
-                            </small>
-                            <small class="form-text text-danger"
-                               *ngIf="passwordForm.get('confirmPassword').errors.maxlength" jhiTranslate="global.messages.validate.confirmpassword.maxlength.string">
-                                Your password confirmation cannot be longer than 50 characters.
-                            </small>
-                        </div>
-                    </div>
-                    <button type="submit" [disabled]="passwordForm.invalid" class="btn btn-primary" jhiTranslate="reset.finish.form.button.string">Reset Password</button>
-                </form>
+      <div class="alert alert-danger" *ngIf="doNotMatch" i18n="@@global.messages.error.dontmatch.string">
+        The password and its confirmation do not match!
+      </div>
+
+      <div *ngIf="!keyMissing && showPasswordForm">
+        <form *ngIf="!success" name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
+          <div class="form-group">
+            <label class="form-control-label" for="password" i18n="@@global.form.newpassword.label.string"
+              >New password</label
+            >
+            <input
+              type="password"
+              class="form-control"
+              id="password"
+              name="password"
+              placeholder="New password"
+              i18n-placeholder="@@global.form.newpassword.placeholder.string"
+              formControlName="newPassword"
+            />
+            <div
+              *ngIf="
+                passwordForm.get('newPassword')?.['invalid'] &&
+                (passwordForm.get('newPassword')?.['dirty'] || passwordForm.get('newPassword')?.['touched'])
+              "
+            >
+              <small
+                class="form-text text-danger"
+                *ngIf="(passwordForm.get('newPassword')?.errors)!['required']"
+                i18n="@@global.messages.validate.newpassword.required.string"
+              >
+                Your password is required.
+              </small>
+              <small
+                class="form-text text-danger"
+                *ngIf="(passwordForm.get('newPassword')?.errors)!['minlength']"
+                i18n="@@global.messages.validate.newpassword.minlength.string"
+              >
+                Your password is required to be at least 4 characters.
+              </small>
+              <small
+                class="form-text text-danger"
+                *ngIf="(passwordForm.get('newPassword')?.errors)!['maxlength']"
+                i18n="@@global.messages.validate.newpassword.maxlength.string"
+              >
+                Your password cannot be longer than 50 characters.
+              </small>
             </div>
+            <app-password-strength [passwordToCheck]="passwordForm.get('newPassword')?.value"></app-password-strength>
+          </div>
 
-        </div>
+          <div class="form-group">
+            <label class="form-control-label" for="confirmPassword" i18n="@@global.form.confirmpassword.label.string"
+              >New password confirmation</label
+            >
+            <input
+              type="password"
+              class="form-control"
+              id="confirmPassword"
+              name="confirmPassword"
+              placehlder="Confirm the new password"
+              i18n-placeholder="@@global.form.confirmpassword.placeholder.string"
+              formControlName="confirmPassword"
+            />
+            <div
+              *ngIf="
+                passwordForm.get('confirmPassword')?.['invalid'] &&
+                (passwordForm.get('confirmPassword')?.['dirty'] || passwordForm.get('confirmPassword')?.['touched'])
+              "
+            >
+              <small
+                class="form-text text-danger"
+                *ngIf="(passwordForm.get('confirmPassword')?.errors)!['required']"
+                i18n="@@global.messages.validate.confirmpassword.required.string"
+              >
+                Your password confirmation is required.
+              </small>
+              <small
+                class="form-text text-danger"
+                *ngIf="(passwordForm.get('confirmPassword')?.errors)!['minlength']"
+                i18n="@@global.messages.validate.confirmpassword.minlength.string"
+              >
+                Your password confirmation is required to be at least 4 characters.
+              </small>
+              <small
+                class="form-text text-danger"
+                *ngIf="(passwordForm.get('confirmPassword')?.errors)!['maxlength']"
+                i18n="@@global.messages.validate.confirmpassword.maxlength.string"
+              >
+                Your password confirmation cannot be longer than 50 characters.
+              </small>
+            </div>
+          </div>
+          <button
+            type="submit"
+            [disabled]="passwordForm.invalid"
+            class="btn btn-primary"
+            i18n="@@reset.finish.form.button.string"
+          >
+            Reset Password
+          </button>
+        </form>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/ui/src/app/account/password/password-reset-finish.component.ts b/ui/src/app/account/password/password-reset-finish.component.ts
index bb04fc943..e5f4f473f 100644
--- a/ui/src/app/account/password/password-reset-finish.component.ts
+++ b/ui/src/app/account/password/password-reset-finish.component.ts
@@ -3,24 +3,21 @@ import { Component, OnInit, AfterViewInit, Renderer2, ElementRef } from '@angula
 import { FormBuilder, FormGroup, Validators } from '@angular/forms'
 import { ActivatedRoute, Router } from '@angular/router'
 
-import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'app-password-reset-finish',
   templateUrl: './password-reset-finish.component.html',
-  styleUrls: ['./password-reset-finish.component.scss'],
 })
 export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
-  doNotMatch: string
-  error: string
-  keyMissing: boolean
-  success: string
-  modalRef: NgbModalRef
-  key: string
-  invalidKey: boolean
-  expiredKey: boolean
-  activationEmailResent: boolean
-  showPasswordForm: boolean
+  doNotMatch: string | undefined
+  error: string | undefined
+  keyMissing: boolean = false
+  success: string | undefined
+  key: string | undefined
+  invalidKey: boolean = false
+  expiredKey: boolean = false
+  activationEmailResent: boolean = false
+  showPasswordForm: boolean = false
 
   passwordForm = this.fb.group({
     newPassword: ['', [Validators.required, Validators.minLength(4), Validators.maxLength(50)]],
@@ -60,22 +57,22 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
   }
 
   finishReset() {
-    this.doNotMatch = null
-    this.error = null
-    const password = this.passwordForm.get(['newPassword']).value
-    const confirmPassword = this.passwordForm.get(['confirmPassword']).value
+    this.doNotMatch = undefined
+    this.error = undefined
+    const password = this.passwordForm.get(['newPassword'])?.value
+    const confirmPassword = this.passwordForm.get(['confirmPassword'])?.value
     if (password !== confirmPassword) {
       this.doNotMatch = 'ERROR'
     } else {
-      this.passwordService.savePassword({ key: this.key, newPassword: password }).subscribe(
-        () => {
+      this.passwordService.savePassword({ key: this.key, newPassword: password }).subscribe({
+        next: () => {
           this.success = 'OK'
         },
-        () => {
-          this.success = null
+        error: () => {
+          this.success = undefined
           this.error = 'ERROR'
         }
-      )
+    })
     }
   }
 

From e25bd0014e2194247a8108f4d29cddb26806424a Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:27:43 +0200
Subject: [PATCH 06/19] add password finish route

---
 ui/src/app/account/account.route.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui/src/app/account/account.route.ts b/ui/src/app/account/account.route.ts
index dac2ef290..517f89720 100644
--- a/ui/src/app/account/account.route.ts
+++ b/ui/src/app/account/account.route.ts
@@ -4,6 +4,7 @@ import { PasswordResetInitComponent } from './password/password-reset-init.compo
 import { SettingsComponent } from './settings/settings.component'
 import { AuthGuard } from './auth.guard'
 import { PasswordComponent } from './password/password.component'
+import { PasswordResetFinishComponent } from './password/password-reset-finish.component'
 
 export const routes: Routes = [
   {
@@ -18,6 +19,14 @@ export const routes: Routes = [
       pageTitle: 'global.menu.account.password.string',
     },
   },
+  {
+    path: 'reset/finish',
+    component: PasswordResetFinishComponent,
+    data: {
+      authorities: [],
+      pageTitle: 'global.menu.account.password.string'
+    }
+  },
   {
     path: 'settings',
     component: SettingsComponent,

From 92675cffd3621aff1bb421588e8dcf3475cc9c86 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:27:53 +0200
Subject: [PATCH 07/19] fix placeholder

---
 .../app/account/password/password-reset-finish.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/account/password/password-reset-finish.component.html b/ui/src/app/account/password/password-reset-finish.component.html
index 7f7494bf2..f91fb9a8a 100644
--- a/ui/src/app/account/password/password-reset-finish.component.html
+++ b/ui/src/app/account/password/password-reset-finish.component.html
@@ -111,7 +111,7 @@ <h1 i18n="@@reset.finish.title.string">Reset password</h1>
               class="form-control"
               id="confirmPassword"
               name="confirmPassword"
-              placehlder="Confirm the new password"
+              placeholder="Confirm the new password"
               i18n-placeholder="@@global.form.confirmpassword.placeholder.string"
               formControlName="confirmPassword"
             />

From c9be6420b6c0a2d8e18f6d0e1305286b9103c3cd Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:28:29 +0200
Subject: [PATCH 08/19] replace jhitranslate with angular i18n

---
 .../password/password-strength.component.html  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/src/app/account/password/password-strength.component.html b/ui/src/app/account/password/password-strength.component.html
index 00bbbd0c5..c08e0e8dd 100644
--- a/ui/src/app/account/password/password-strength.component.html
+++ b/ui/src/app/account/password/password-strength.component.html
@@ -1,10 +1,10 @@
 <div id="strength">
-    <small jhiTranslate="global.messages.validate.newpassword.strength.string">Password strength:</small>
-    <ul id="strengthBar">
-      <li class="point"></li>
-      <li class="point"></li>
-      <li class="point"></li>
-      <li class="point"></li>
-      <li class="point"></li>
-    </ul>
-</div>
\ No newline at end of file
+  <small i18n="@@global.messages.validate.newpassword.strength.string">Password strength:</small>
+  <ul id="strengthBar">
+    <li class="point"></li>
+    <li class="point"></li>
+    <li class="point"></li>
+    <li class="point"></li>
+    <li class="point"></li>
+  </ul>
+</div>

From a0de0b5882dd46a898541a94183e5c1d1410ae77 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:51:31 +0200
Subject: [PATCH 09/19] fix test and lint

---
 .../password/password-reset-finish.component.html      |  9 ++++++++-
 .../password/password-reset-finish.component.spec.ts   |  2 ++
 .../password/password-reset-finish.component.ts        | 10 +++++-----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/account/password/password-reset-finish.component.html b/ui/src/app/account/password/password-reset-finish.component.html
index f91fb9a8a..86e29d069 100644
--- a/ui/src/app/account/password/password-reset-finish.component.html
+++ b/ui/src/app/account/password/password-reset-finish.component.html
@@ -49,7 +49,14 @@ <h1 i18n="@@reset.finish.title.string">Reset password</h1>
         <span i18n="@@reset.finish.messages.success.string"
           ><strong>Your password has been reset.</strong> Please
         </span>
-        <a class="alert-link" (click)="login()" i18n="@@global.messages.info.authenticated.link.string">sign in</a>.
+        <a
+          class="alert-link"
+          tabindex="0"
+          (click)="login()"
+          (keydown.enter)="login()"
+          i18n="@@global.messages.info.authenticated.link.string"
+          >sign in</a
+        >.
       </p>
 
       <div class="alert alert-danger" *ngIf="doNotMatch" i18n="@@global.messages.error.dontmatch.string">
diff --git a/ui/src/app/account/password/password-reset-finish.component.spec.ts b/ui/src/app/account/password/password-reset-finish.component.spec.ts
index 7b8bbd274..c6bdfb4d6 100644
--- a/ui/src/app/account/password/password-reset-finish.component.spec.ts
+++ b/ui/src/app/account/password/password-reset-finish.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PasswordResetFinishComponent } from './password-reset-finish.component';
+import { AppModule } from 'src/app/app.module';
 
 describe('PasswordResetFinishComponent', () => {
   let component: PasswordResetFinishComponent;
@@ -8,6 +9,7 @@ describe('PasswordResetFinishComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      imports: [AppModule],
       declarations: [PasswordResetFinishComponent]
     });
     fixture = TestBed.createComponent(PasswordResetFinishComponent);
diff --git a/ui/src/app/account/password/password-reset-finish.component.ts b/ui/src/app/account/password/password-reset-finish.component.ts
index e5f4f473f..4133841e5 100644
--- a/ui/src/app/account/password/password-reset-finish.component.ts
+++ b/ui/src/app/account/password/password-reset-finish.component.ts
@@ -11,13 +11,13 @@ import { ActivatedRoute, Router } from '@angular/router'
 export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
   doNotMatch: string | undefined
   error: string | undefined
-  keyMissing: boolean = false
   success: string | undefined
   key: string | undefined
-  invalidKey: boolean = false
-  expiredKey: boolean = false
-  activationEmailResent: boolean = false
-  showPasswordForm: boolean = false
+  invalidKey = false
+  keyMissing = false
+  expiredKey = false
+  activationEmailResent = false
+  showPasswordForm = false
 
   passwordForm = this.fb.group({
     newPassword: ['', [Validators.required, Validators.minLength(4), Validators.maxLength(50)]],

From 2b457d422f7b5213a4f74cc762ebced87dce853b Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:52:59 +0200
Subject: [PATCH 10/19] add new translations from old app

---
 ui/src/i18n/messages.cs.xlf    | 261 ++++++++++++++++++++++++------
 ui/src/i18n/messages.es.xlf    | 261 ++++++++++++++++++++++++------
 ui/src/i18n/messages.fr.xlf    | 267 +++++++++++++++++++++++++------
 ui/src/i18n/messages.it.xlf    | 281 +++++++++++++++++++++++++++------
 ui/src/i18n/messages.ja.xlf    | 262 ++++++++++++++++++++++++------
 ui/src/i18n/messages.ko.xlf    | 261 ++++++++++++++++++++++++------
 ui/src/i18n/messages.pt.xlf    | 262 ++++++++++++++++++++++++------
 ui/src/i18n/messages.ru.xlf    | 261 ++++++++++++++++++++++++------
 ui/src/i18n/messages.xlf       | 167 +++++++++++++++++++-
 ui/src/i18n/messages.zh-CN.xlf | 261 ++++++++++++++++++++++++------
 ui/src/i18n/messages.zh-TW.xlf | 261 ++++++++++++++++++++++++------
 11 files changed, 2343 insertions(+), 462 deletions(-)

diff --git a/ui/src/i18n/messages.cs.xlf b/ui/src/i18n/messages.cs.xlf
index 890172bcd..bf73aff7c 100644
--- a/ui/src/i18n/messages.cs.xlf
+++ b/ui/src/i18n/messages.cs.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Přihlášení se nezdařilo!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Zkontrolujte prosím své přihlašovací údaje a zkuste to znovu.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Přihlášení se nezdařilo!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Zkontrolujte prosím své přihlašovací údaje a zkuste to znovu.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -391,8 +391,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>E-mailová adresa není zaregistrovaná!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Zkontrolujte ji prosím a zkuste to znovu</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>E-mailová adresa není zaregistrovaná!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Zkontrolujte ji prosím a zkuste to znovu</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -463,8 +463,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Nastavení uloženo!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Nastavení uloženo!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -603,16 +603,16 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">Nainstalujte si aplikaci pro dvoufázové ověření<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Aplikace pro dvoufázové ověření je vyžadována, abyste vytvořili šestimístní kód a pomocí něj získali přístup ke svému účtu pokaždé, když se přihlásíte. Většina aplikací je pro mobilní zařízení. Některé jsou také dostupné jako desktopové a prohlížečové aplikace. Stáhněte a nainstalujte si vámi preferovanou aplikaci pro dvoufázové ověření jako například <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> nebo <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">Nainstalujte si aplikaci pro dvoufázové ověření<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Aplikace pro dvoufázové ověření je vyžadována, abyste vytvořili šestimístní kód a pomocí něj získali přístup ke svému účtu pokaždé, když se přihlásíte. Většina aplikací je pro mobilní zařízení. Některé jsou také dostupné jako desktopové a prohlížečové aplikace. Stáhněte a nainstalujte si vámi preferovanou aplikaci pro dvoufázové ověření jako například <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x> nebo <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">Naskenujte tento QR kód vaším zařízením<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Otěvřete svou aplikaci pro dvoufázové ověření a naskenujte obrázek níže.</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">Naskenujte tento QR kód vaším zařízením<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Otěvřete svou aplikaci pro dvoufázové ověření a naskenujte obrázek níže.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +643,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">Vložte šestimístní kód z aplikace<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Po naskenování QR kódu nebo vložení kódu z SMS se v aplikaci pro dvoufázové ověření zobrazí šestimístní kód. Vložte tento kód do pole níže a klikněte na tlačítko Uložit.</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">Vložte šestimístní kód z aplikace<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Po naskenování QR kódu nebo vložení kódu z SMS se v aplikaci pro dvoufázové ověření zobrazí šestimístní kód. Vložte tento kód do pole níže a klikněte na tlačítko Uložit.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -867,25 +867,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">Heslo pro {{username}} (vy)<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Heslo změněno!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Došlo k chybě!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Heslo nelze změnit.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +892,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">Heslo a jeho potvrzení nesouhlasí</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +904,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">Stávající heslo</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +920,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">Je potřeba vaše heslo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +936,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nové heslo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +948,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nové heslo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +960,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">Vaše heslo musí mít alespoň 4 znaky.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +972,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">Vaše heslo nesmí být delší než 50 znaků.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +984,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">Potvrzení nového hesla</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +996,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">Potvrďte nové heslo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">Musíte uvést potvrzovací heslo.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">Vaše potvrzovací heslo musí mít alespoň 4 znaky.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">Vaše potvrzovací heslo nesmí být delší než 50 znaků.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1044,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">Uložit</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1054,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">Znovu nastavit heslo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Chybí aktivační klíč.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Aktivační klíč je neplatný.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Vypršela platnost aktivačního klíče.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">Vyberte nové heslo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">Heslo nelze znovu nastavit. Nezapomeňte, že žádost o heslo platí pouze 24 hodin.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Vaše heslo bylo obnoveno.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Prosím</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">přihlásit se</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">Ověřte nové heslo</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">Vaši žádost nelze zpracovat</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">Pro přístup na tuto stránku nemáte dostatečná oprávnění.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">Stránka neexistuje.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">Síla hesla:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.es.xlf b/ui/src/i18n/messages.es.xlf
index 2415625e3..d27e72990 100644
--- a/ui/src/i18n/messages.es.xlf
+++ b/ui/src/i18n/messages.es.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>¡No se ha podido iniciar sesión!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Compruebe sus credenciales y vuelva a intentarlo.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>¡No se ha podido iniciar sesión!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Compruebe sus credenciales y vuelva a intentarlo.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -383,8 +383,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>¡Ajustes guardados!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>¡Ajustes guardados!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -507,16 +507,16 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">Instale una aplicación de autenticación de dos factores<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Es necesaria una aplicación 2FA que genere un código de seis dígitos para acceder a su cuenta cada vez que inicie sesión. La mayoría de estas aplicaciones son para dispositivos móviles, aunque también las hay para escritorio o basadas en la web. Descargue e instale su aplicación 2FA preferida, por ejemplo: <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, o <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">Instale una aplicación de autenticación de dos factores<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Es necesaria una aplicación 2FA que genere un código de seis dígitos para acceder a su cuenta cada vez que inicie sesión. La mayoría de estas aplicaciones son para dispositivos móviles, aunque también las hay para escritorio o basadas en la web. Descargue e instale su aplicación 2FA preferida, por ejemplo: <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, o <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">Escanee este código QR en su dispositivo<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Abra su aplicación 2FA y escanee la siguiente imagen.</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">Escanee este código QR en su dispositivo<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Abra su aplicación 2FA y escanee la siguiente imagen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -547,8 +547,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">Introduzca el código de seis dígitos de la aplicación<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Tras escanear el código QR o introducir el código de texto, su aplicación 2FA le mostrará un código de seis dígitos. Introdúzcalo en el cuadro siguiente y haga clic en Guardar.</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">Introduzca el código de seis dígitos de la aplicación<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Tras escanear el código QR o introducir el código de texto, su aplicación 2FA le mostrará un código de seis dígitos. Introdúzcalo en el cuadro siguiente y haga clic en Guardar.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -587,8 +587,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>¡La dirección de correo electrónico no está registrada!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Compruébalo e inténtalo de nuevo.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>¡La dirección de correo electrónico no está registrada!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Compruébalo e inténtalo de nuevo.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -867,25 +867,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">Contraseña de {{username}} (usted)<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>¡Se ha cambiado la contraseña!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>¡Ha ocurrido un error!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> No se ha podido cambiar la contraseña.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +892,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">La contraseña y su confirmación no coinciden</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +904,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">Contraseña actual</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +920,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">Tu contraseña es necesaria.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +936,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nueva contraseña</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +948,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nueva contraseña</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +960,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">Su contraseña debe tener al menos 4 caracteres.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +972,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">Su contraseña no puede tener más de 50 caracteres.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +984,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">Confirmación de la nueva contraseña</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +996,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">Confirme la nueva contraseña</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">Se requiere su contraseña de confirmación.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">La contraseña de confirmación tiene que contener al menos 4 caracteres.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">Su contraseña de confirmación no puede tener más de 50 caracteres.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1044,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">Guardar</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1054,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">Restablecer la contraseña</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Falta la clave de activación.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>La clave de activación no es válida.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>La clave de activación ha caducado.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">Elija una nueva contraseña</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">No se ha podido restablecer tu contraseña. Recuerde que una solicitud de contraseña solo es válida por 24 horas.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Se ha restablecido su contraseña.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Por favor,</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">iniciar sesión</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">Validar la nueva contraseña</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">Su solicitud no puede procesarse</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">No tiene permisos para acceder a esta página.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">La página no existe.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">Seguridad de la contraseña:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.fr.xlf b/ui/src/i18n/messages.fr.xlf
index 3d59c6bcf..d14dfd8fa 100644
--- a/ui/src/i18n/messages.fr.xlf
+++ b/ui/src/i18n/messages.fr.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Échec de la connexion !<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Veuillez vérifier vos identifiants et réessayer.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Échec de la connexion !<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Veuillez vérifier vos identifiants et réessayer.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -360,7 +360,8 @@
       </trans-unit>
       <trans-unit id="login.form.mfaCode.label.string" datatype="html">
         <source>MFA code</source>
-        <target state="new">Code MFA </target>
+        <target state="new">Code MFA
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">40</context>
@@ -391,8 +392,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>L&apos;adresse e-mail n&apos;est pas enregistrée !<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Veuillez vérifier et réessayer</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>L&apos;adresse e-mail n&apos;est pas enregistrée !<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Veuillez vérifier et réessayer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -463,8 +464,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Réglages enregistrés !<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Réglages enregistrés !<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -596,23 +597,24 @@
       </trans-unit>
       <trans-unit id="settings.security.mfaUpdated.string" datatype="html">
         <source>2FA settings updated</source>
-        <target state="new">Mise à jour des paramètres A2F </target>
+        <target state="new">Mise à jour des paramètres A2F
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">160</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">Installer une application d&apos;authentification à deux facteurs<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Une application A2F est nécessaire pour créer le code à six chiffres dont vous avez besoin pour accéder à votre compte à chaque fois que vous vous connectez. La plupart des applications sont destinées aux appareils mobiles ; certaines sont également disponibles en tant qu&apos;applications de bureau ou web. Téléchargez et installez votre application A2F préférée, telle que <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, ou <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">Installer une application d&apos;authentification à deux facteurs<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Une application A2F est nécessaire pour créer le code à six chiffres dont vous avez besoin pour accéder à votre compte à chaque fois que vous vous connectez. La plupart des applications sont destinées aux appareils mobiles ; certaines sont également disponibles en tant qu&apos;applications de bureau ou web. Téléchargez et installez votre application A2F préférée, telle que <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, ou <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">Scannez ce code QR avec votre appareil<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Ouvrez votre application A2F et scannez l&apos;image ci-dessous.</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">Scannez ce code QR avec votre appareil<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Ouvrez votre application A2F et scannez l&apos;image ci-dessous.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +645,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">Saisissez le code à six chiffres dans l&apos;application<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Après avoir scanné le code QR ou saisi le code texte, votre application A2F affiche un code à six chiffres. Saisissez ce code dans la case ci-dessous et cliquez sur Enregistrer.</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">Saisissez le code à six chiffres dans l&apos;application<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Après avoir scanné le code QR ou saisi le code texte, votre application A2F affiche un code à six chiffres. Saisissez ce code dans la case ci-dessous et cliquez sur Enregistrer.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -867,25 +869,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">Mot de passe pour {{username}} (vous)<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Mot de passe modifié !<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Une erreur s&apos;est produite !<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Le mot de passe n&apos;a pas pu être modifié.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +894,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">Le mot de passe et sa confirmation ne correspondent pas !</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +906,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">Mot de passe actuel</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +922,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">Votre mot de passe est requis.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +938,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nouveau mot de passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +950,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nouveau mot de passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +962,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">Votre mot de passe doit contenir au moins 4 caractères.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +974,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">Votre mot de passe ne doit pas compter plus de 50 caractères.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +986,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">Confirmation du nouveau mot de passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +998,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">Confirmer le nouveau mot de passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">Votre mot de passe de confirmation est obligatoire.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">Votre confirmation de mot de passe doit compter au moins quatre caractères.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">Votre mot de passe de confirmation ne peut pas comporter plus de 50 caractères.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1046,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">Enregistrer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1056,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">Réinitialiser le mot de passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>La clé d&apos;activation est manquante.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>La clé d&apos;activation est invalide.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>La clé d&apos;activation est expirée.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">Choisissez un nouveau mot de passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">Votre mot de passe n&apos;a pas pu être réinitialisé. N&apos;oubliez pas qu&apos;une demande de réinitialisation de mot de passe n&apos;est valide que pendant 24 heures.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Votre mot de passe a été réinitialisé.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Veuillez</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">s&apos;identifier</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">Validez le nouveau mot de passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">Votre demande ne peut pas être traitée.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">Vous n&apos;êtes pas autorisé à accéder à cette page.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">La page n&apos;existe pas. </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">Robustesse du mot de passe :</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.it.xlf b/ui/src/i18n/messages.it.xlf
index c56df8a2c..2c10f7276 100644
--- a/ui/src/i18n/messages.it.xlf
+++ b/ui/src/i18n/messages.it.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Accesso non riuscito!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Controlla le credenziali e riprova.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Accesso non riuscito!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Controlla le credenziali e riprova.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -391,8 +391,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>L&apos;indirizzo e-mail non è registrato!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Controlla e riprova</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>L&apos;indirizzo e-mail non è registrato!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Controlla e riprova</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -400,7 +400,8 @@
       </trans-unit>
       <trans-unit id="reset.request.messages.info.string" datatype="html">
         <source>Enter the email address you used to register.</source>
-        <target state="new">Inserisci l&apos;indirizzo e-mail che hai usato per registrarti </target>
+        <target state="new">Inserisci l&apos;indirizzo e-mail che hai usato per registrarti
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">11</context>
@@ -463,8 +464,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Impostazioni salvate!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Impostazioni salvate!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -504,7 +505,8 @@
       </trans-unit>
       <trans-unit id="settings.messages.validate.firstname.maxlength.string" datatype="html">
         <source> Your first name cannot be longer than 50 characters. </source>
-        <target state="new">Il tuo nome non può superare i 50 caratteri </target>
+        <target state="new">Il tuo nome non può superare i 50 caratteri
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">56</context>
@@ -528,7 +530,8 @@
       </trans-unit>
       <trans-unit id="settings.messages.validate.lastname.required.string" datatype="html">
         <source> Your last name is required. </source>
-        <target state="new">Il tuo cognome è obbligatorio. </target>
+        <target state="new">Il tuo cognome è obbligatorio.
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">84</context>
@@ -603,16 +606,16 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">Installa un&apos;app di autenticazione a due fattori<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>È necessaria un&apos;app 2FA per creare il codice a sei cifre necessario per aprire il tuo account ogni volta che effettui l&apos;accesso. La maggior parte di queste app sono per dispositivi mobili, ma alcune di esse sono disponibili anche come applicazione per desktop o web app. Scarica e installa la tua app 2FA preferita, come <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> o <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">Installa un&apos;app di autenticazione a due fattori<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>È necessaria un&apos;app 2FA per creare il codice a sei cifre necessario per aprire il tuo account ogni volta che effettui l&apos;accesso. La maggior parte di queste app sono per dispositivi mobili, ma alcune di esse sono disponibili anche come applicazione per desktop o web app. Scarica e installa la tua app 2FA preferita, come <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x> o <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">Scansiona questo codice QR con il tuo dispositivo<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Apri la tua app 2FA e scansiona l&apos;immagine qui sotto.</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">Scansiona questo codice QR con il tuo dispositivo<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Apri la tua app 2FA e scansiona l&apos;immagine qui sotto.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +646,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">Inserisci il codice a sei cifre fornito dalla app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Dopo aver scansionato il codice QR o inserito il codice di testo, l&apos;app 2FA visualizzerà un codice a sei cifre. Inserisci questo codice nella casella sottostante e fai clic su Salva.</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">Inserisci il codice a sei cifre fornito dalla app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Dopo aver scansionato il codice QR o inserito il codice di testo, l&apos;app 2FA visualizzerà un codice a sei cifre. Inserisci questo codice nella casella sottostante e fai clic su Salva.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -708,7 +711,8 @@
       </trans-unit>
       <trans-unit id="global.menu.report.integration.string" datatype="html">
         <source>Integration report</source>
-        <target state="new">Rapporto di integrazione </target>
+        <target state="new">Rapporto di integrazione
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/layout/navbar/navbar.component.html</context>
           <context context-type="linenumber">92</context>
@@ -867,25 +871,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">Password per {{username}} (tu)<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password modificata!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Si è verificato un errore!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Non è stato possibile modificare la password.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +896,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">La password e la sua conferma non combaciano!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +908,8 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">Password attuale
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +925,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">La tua password è obbligatoria.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +941,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nuova password</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +953,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nuova password</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +965,12 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">La tua password deve contenere almeno 4 caratteri.
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +978,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">La password non può essere più lunga di 50 caratteri.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +990,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">Conferma nuova password</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +1002,48 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">Conferma la nuova password</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">La tua password di conferma è obbligatoria.
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">La password di conferma deve contenere almeno 4 caratteri</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">La password di conferma non può contenere più di 50 caratteri.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1051,8 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">Salva
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1062,142 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">Ripristina la password</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Manca la chiave di attivazione.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>La chiave di attivazione non è valida.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>La chiave di attivazione è scaduta.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">Scegli una nuova password
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">Impossibile ripristinare la tua password. Ti ricordiamo che la richiesta della password è valida solo per 24 ore.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>La tua password è stata reimpostata.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Per favore
+
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">accedi</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">Convalida la nuova password</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">Non è stato possibile elaborare la tua richiesta</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">Non sei autorizzato ad accedere a questa pagina.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">La pagina non esiste.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">Sicurezza della password:
+</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.ja.xlf b/ui/src/i18n/messages.ja.xlf
index 46440cfeb..7e7da2c5f 100644
--- a/ui/src/i18n/messages.ja.xlf
+++ b/ui/src/i18n/messages.ja.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/> サインインに失敗しました。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> 認証情報をご確認の上、再度お試し下さい。 </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x> サインインに失敗しました。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> 認証情報をご確認の上、再度お試し下さい。 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -391,8 +391,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Eメールアドレスが登録されていません！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/>確認して、もう一度やり直してください</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Eメールアドレスが登録されていません！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x>確認して、もう一度やり直してください</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -463,8 +463,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>設定が保存されました！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>設定が保存されました！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -603,16 +603,17 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">2段階認証アプリをインストール<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>サインインをする度にアカウントへのアクセスに必要となる6桁のコードを作成するために、2段階認証アプリが必須となります。多くのアプリはモバイルデバイス向けですが、デスクトップやウェブ上のアプリとして使用可能なものもあります。<x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>、<x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>、<x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>などのお好きな2段階認証アプリをダウンロードして、インストールしてください。</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">2段階認証アプリをインストール<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>サインインをする度にアカウントへのアクセスに必要となる6桁のコードを作成するために、2段階認証アプリが必須となります。多くのアプリはモバイルデバイス向けですが、デスクトップやウェブ上のアプリとして使用可能なものもあります。<x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>、<x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>、<x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>などのお好きな2段階認証アプリをダウンロードして、インストールしてください。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">ご使用のデバイスでこちらのQRコードをスキャンしてください<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/> </target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">ご使用のデバイスでこちらのQRコードをスキャンしてください<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +644,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">アプリで受け取った6桁のコードを入力してください<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>QRコードをスキャンまたはテキストコードを入力した後に、2段階認証アプリに6桁のコードが表示されます。このコードを以下のボックスに入力して、保存をクリックしてください。</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">アプリで受け取った6桁のコードを入力してください<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>QRコードをスキャンまたはテキストコードを入力した後に、2段階認証アプリに6桁のコードが表示されます。このコードを以下のボックスに入力して、保存をクリックしてください。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -867,25 +868,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">{{username}}（あなた）のパスワード<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>パスワードが変更されました！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x> エラーが発生しました。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> パスワードが変更できません。 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +893,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">パスワードとその確認が一致しません！</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +905,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">現在のパスワード</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +921,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">パスワードが必要です。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +937,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">新しいパスワード</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +949,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">新しいパスワード</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +961,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">パスワードは4文字以上である必要があります。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +973,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">パスワードは 50 文字より長くすることはできません</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +985,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">新しいパスワードの確認</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +997,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">新しいパスワードの確認</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">確認パスワードが必要です。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">確認用パスワード には少なくとも 4 文字が必要です。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">確認パスワードは50文字を超えることはできません。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1045,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">保存する</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1055,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">パスワードをリセット</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>有効化キーがありません。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>有効化キーが無効です。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>アクティベーションキーの有効期限が切れています。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">新しいパスワードを選んでください</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">パスワードがリセットできませんでした。パスワードの要求は 24 時間に限り有効であることにご留意ください。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x> お客様のパスワードが変更されました。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> 行って下さい。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">サインイン</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">新しいパスワードを有効にする</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">リクエストを処理できません</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">あなたはこのページにアクセスする権限がありません。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">このページは存在しません。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">パスワードの強度：</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.ko.xlf b/ui/src/i18n/messages.ko.xlf
index 38a2e514f..a390a9cb6 100644
--- a/ui/src/i18n/messages.ko.xlf
+++ b/ui/src/i18n/messages.ko.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>로그인에 실패했습니다!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> 사용자 자격 증명을 확인하여 다시 시도해 주세요.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>로그인에 실패했습니다!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> 사용자 자격 증명을 확인하여 다시 시도해 주세요.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -391,8 +391,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>이메일 주소가 등록되지 않았습니다!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> 확인하여 다시 시도해 주세요.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>이메일 주소가 등록되지 않았습니다!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> 확인하여 다시 시도해 주세요.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -463,8 +463,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>설정이 저장되었습니다!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>설정이 저장되었습니다!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -603,16 +603,16 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">2단계 인증 앱 설치<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>2단계 인증 앱은 로그인할 때마다 계정에 접근하는 데 필요한 6자리 코드를 생성합니다. 대부분 모바일 기기용 앱이며, 데스크톱이나 웹 기반 앱을 이용할 수도 있습니다. <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>와 같은 2단계 인증 앱 중 하나를 다운로드하고 설치하세요.</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">2단계 인증 앱 설치<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>2단계 인증 앱은 로그인할 때마다 계정에 접근하는 데 필요한 6자리 코드를 생성합니다. 대부분 모바일 기기용 앱이며, 데스크톱이나 웹 기반 앱을 이용할 수도 있습니다. <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>와 같은 2단계 인증 앱 중 하나를 다운로드하고 설치하세요.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">사용 중인 기기로 이 QR 코드 스캔<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>2단계 인증 앱을 열고 아래 이미지를 스캔하세요.</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">사용 중인 기기로 이 QR 코드 스캔<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>2단계 인증 앱을 열고 아래 이미지를 스캔하세요.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +643,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">앱의 6자리 코드 입력<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>QR 코드를 스캔하거나 텍스트 코드를 입력하시면 2단계 인증 앱에 6자리 코드가 표시됩니다. 아래 상자에 이 코드를 입력하고 저장을 클릭하세요.</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">앱의 6자리 코드 입력<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>QR 코드를 스캔하거나 텍스트 코드를 입력하시면 2단계 인증 앱에 6자리 코드가 표시됩니다. 아래 상자에 이 코드를 입력하고 저장을 클릭하세요.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -867,25 +867,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">{{username}} 비밀번호(사용자)<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>비밀번호가 변경되었습니다!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>오류가 발생했습니다!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> 비밀번호를 변경할 수 없습니다.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +892,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">비밀번호와 비밀번호 확인이 일치하지 않습니다!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +904,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">기존 비밀번호</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +920,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">비밀번호가 필요합니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +936,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">새 비밀번호</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +948,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">새 비밀번호</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +960,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">비밀번호는 4자 이상이어야 합니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +972,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">비밀번호는 50자를 초과할 수 없습니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +984,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">새 비밀번호 확인</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +996,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">새 비밀번호 확인</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">확인 비밀번호가 필요합니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">확인 비밀번호는 4자 이상이어야 합니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">확인 비밀번호는 50자를 초과할 수 없습니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1044,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">저장</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1054,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">비밀번호 재설정</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>활성화 키가 없습니다.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>활성화 키가 잘못되었습니다.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>활성화 키가 만료되었습니다.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">새 비밀번호 선택</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">비밀번호를 초기화할 수 없습니다. 비밀번호 요청은 24시간 동안만 유효합니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>비밀번호가 재설정되었습니다.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x>undefined</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">로그인</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">새 비밀번호 인증</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">요청을 처리할 수 없습니다</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">이 페이지에 액세스할 수 있는 권한이 없습니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">존재하지 않는 페이지입니다.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">비밀번호 강도:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.pt.xlf b/ui/src/i18n/messages.pt.xlf
index b8b434667..0ffe69fbe 100644
--- a/ui/src/i18n/messages.pt.xlf
+++ b/ui/src/i18n/messages.pt.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Erro ao iniciar sessão!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Por favor verifique as suas credenciais e tente novamente.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Erro ao iniciar sessão!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Por favor verifique as suas credenciais e tente novamente.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -391,8 +391,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>O endereço de e-mail não está registado!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Verifique e tente novamente</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>O endereço de e-mail não está registado!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Verifique e tente novamente</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -463,8 +463,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Configurações gravadas!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Configurações gravadas!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -603,16 +603,16 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">Instale uma aplicação de autenticação de dois fatores<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Uma aplicação de 2FA é requerida para criar o código de seis dígitos de que necessita para aceder à sua conta de cada vez que iniciar sessão. A maioria das aplicações são para dispositivos móveis; algumas estão disponíveis para PC, ou são baseadas na rede. Transfira e instale a sua aplicação de 2FA favorita, tal como a <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, a <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, ou a <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">Instale uma aplicação de autenticação de dois fatores<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Uma aplicação de 2FA é requerida para criar o código de seis dígitos de que necessita para aceder à sua conta de cada vez que iniciar sessão. A maioria das aplicações são para dispositivos móveis; algumas estão disponíveis para PC, ou são baseadas na rede. Transfira e instale a sua aplicação de 2FA favorita, tal como a  <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, a <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, ou a <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">Digitalize este código QR com o seu dispositivo<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Abra a sua aplicação de 2FA e digitalize a imagem abaixo.</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">Digitalize este código QR com o seu dispositivo<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Abra a sua aplicação de 2FA e digitalize a imagem abaixo.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +643,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">Introduza o código de seis dígitos na aplicação<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Após digitalizar o código QR ou introduzir o código de texto, a sua aplicação de 2FA exibirá um código de seis dígitos. Introduza este código na caixa abaixo e clique em Guardar.</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">Introduza o código de seis dígitos na aplicação<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Após digitalizar o código QR ou introduzir o código de texto, a sua aplicação de 2FA exibirá um código de seis dígitos. Introduza este código na caixa abaixo e clique em Guardar.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -867,25 +867,25 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">Palavra-passe para {{username}} (Você)<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Palavra-passe alterada!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Ocorreu um erro!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Não foi possível alterar a palavra-passe.
+</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +893,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">A palavra-chave e a sua confirmação não coincidem!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +905,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">Atual palavra-passe</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +921,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">É necessária a sua palavra-passe.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +937,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nova palavra-passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +949,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Nova palavra-passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +961,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">A sua palavra-passe deverá ter pelo menos 4 caracteres</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +973,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">Esta palavra-passe não pode ter mais de 50 caractéres.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +985,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">Confirmação da nova palavra-passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +997,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">Confirme a nova palavra-passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">É necessária a sua palavra-passe de confirmação.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">A sua palavra-passe de confirmação precisa de ter pelo menos 4 caracteres.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">A sua palavra-passe de confirmação não pode ter mais de 50 caracteres.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1045,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">Guardar</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1055,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">Redefinir palavra-passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Falta o código de ativação.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>A chave de ativação é inválida.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Esta chave de ativação expirou.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">Escolha uma nova palavra-passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">Não foi possível redefinir a sua palavra-passe. Lembre-se que um pedido de palavra-passe é apenas válido por 24 horas.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>A sua palavra-passe foi redefinida.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Por favor</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">iniciar sessão</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">Validar nova palavra-passe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">O seu pedido não pode ser processado</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">Não está autorizado a aceder a esta página.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">Esta página não existe.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">Força da palavra-passe:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.ru.xlf b/ui/src/i18n/messages.ru.xlf
index cc51321d1..fde5bffcf 100644
--- a/ui/src/i18n/messages.ru.xlf
+++ b/ui/src/i18n/messages.ru.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Не удалось войти!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Проверьте свои учетные данные и повторите попытку.</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Не удалось войти!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Проверьте свои учетные данные и повторите попытку.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -391,8 +391,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Электронный адрес не зарегистрирован!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/>Пожалуйста, проверьте и попробуйте ещё раз</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Электронный адрес не зарегистрирован!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x>Пожалуйста, проверьте и попробуйте ещё раз</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -463,8 +463,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Настройки сохранены!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Настройки сохранены!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -603,16 +603,16 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">Установите приложение двухфакторной аутентификации<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Для создания шестизначного кода, необходимого для доступа к аккаунту при каждом входе в него, требуется приложение двухфакторной аутентификации. Большинство приложений предназначены для мобильных устройств; некоторые также доступны в виде настольных или веб-приложений. Загрузите и установите ваше приложение двухфакторной аутентификации, например <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> или <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">Установите приложение двухфакторной аутентификации<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Для создания шестизначного кода, необходимого для доступа к аккаунту при каждом входе в него, требуется приложение двухфакторной аутентификации. Большинство приложений предназначены для мобильных устройств; некоторые также доступны в виде настольных или веб-приложений. Загрузите и установите ваше приложение двухфакторной аутентификации, например <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x> или <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">Отсканируйте этот QR-код на своем устройстве<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Откройте приложение двухфакторной аутентификации и отсканируйте изображение ниже.</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">Отсканируйте этот QR-код на своем устройстве<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Откройте приложение двухфакторной аутентификации и отсканируйте изображение ниже.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +643,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">Введите шестизначный код из приложения<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>После сканирования QR-кода или ввода кода из СМС ваше приложение двухфакторной аутентификации покажет шестизначный код. Введите этот код в поле ниже и нажмите &quot;Сохранить&quot;.</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">Введите шестизначный код из приложения<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>После сканирования QR-кода или ввода кода из СМС ваше приложение двухфакторной аутентификации покажет шестизначный код. Введите этот код в поле ниже и нажмите &quot;Сохранить&quot;.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -867,25 +867,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">Пароль для {{username}} (Вы)<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Пароль изменен!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Произошла ошибка!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Не удалось изменить пароль.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +892,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">Пароль и его подтверждение не совпадают!</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +904,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">Текущий пароль</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +920,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">Ваш пароль необходим.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +936,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Новый пароль</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +948,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">Новый пароль</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +960,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">Ваш пароль должен состоять из минимум 4 символов.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +972,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">Ваш пароль не может состоять из более чем 50 символов.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +984,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">Новый пароль-подтверждение</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +996,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">Подтвердить новый пароль</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">Необходимо подтверждение пароля.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">Ваш пароль-подтверждение должен состоять из минимум 4 символов.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">Ваш пароль-подтверждение не может состоять из более чем 50 символов.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1044,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">Сохранить</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1054,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">Сбросить пароль</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Отсутствует ключ активации.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Ключ активации недействителен.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Срок действия ключа активации истек.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">Выберите новый пароль</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">Ваш пароль не может быть сброшен. Помните, что запрос пароля действителен только в течение 24 часов.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Ваш пароль сброшен.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Пожалуйста,</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">войти</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">Подтвердить новый пароль</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">Ваш запрос не может быть обработан</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">Вы не авторизованы для просмотра этой страницы.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">Эта страница не существует.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">Надежность пароля:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.xlf b/ui/src/i18n/messages.xlf
index f23afcd18..21848a1a5 100644
--- a/ui/src/i18n/messages.xlf
+++ b/ui/src/i18n/messages.xlf
@@ -400,10 +400,9 @@
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
         <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <note priority="1" from="description">Password label with username param</note>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
@@ -422,6 +421,10 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -443,6 +446,10 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -454,6 +461,10 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -461,6 +472,10 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -468,6 +483,10 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -475,6 +494,10 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -482,6 +505,10 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -489,27 +516,43 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
+        <source> Your password confirmation is required. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -886,10 +929,122 @@
       <trans-unit id="error.subtitle" datatype="html">
         <source>Sorry, an error has occurred</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.zh-CN.xlf b/ui/src/i18n/messages.zh-CN.xlf
index b75166f59..e38d7ea60 100644
--- a/ui/src/i18n/messages.zh-CN.xlf
+++ b/ui/src/i18n/messages.zh-CN.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>登录失败！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/>请检查您的凭证并重试。</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>登录失败！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x>请检查您的凭证并重试。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -391,8 +391,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>电子邮件地址尚未注册！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/>请检查并重试</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>电子邮件地址尚未注册！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x>请检查并重试</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -463,8 +463,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>设置已保存！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>设置已保存！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -603,16 +603,16 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">安装双重身份验证应用<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>每次登录时都需要 2FA 应用程序来创建访问帐户所需的六位数代码。大多数应用程序适用于移动设备；有些还可以作为桌面或基于 Web 的应用程序使用。下载并安装您首选的 2FA 应用，例如 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>、<x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> 或 <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>。</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">安装双重身份验证应用<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>每次登录时都需要 2FA 应用程序来创建访问帐户所需的六位数代码。大多数应用程序适用于移动设备；有些还可以作为桌面或基于 Web 的应用程序使用。下载并安装您首选的 2FA 应用，例如 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>、<x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x> 或 <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">使用设备扫描此二维码<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>打开 2FA 应用并扫描下方图像。</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">使用设备扫描此二维码<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>打开 2FA 应用并扫描下方图像。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +643,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">输入来自应用的六位数验证码<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>扫描二维码或输入短信验证码后，2FA 即会显示一个六位数验证码。在下方框中输入该验证码，然后单击“保存”。</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">输入来自应用的六位数验证码<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>扫描二维码或输入短信验证码后，2FA 即会显示一个六位数验证码。在下方框中输入该验证码，然后单击“保存”。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -867,25 +867,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new">{{username}}（您）的密码<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>密码已更改！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>出现错误！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x>密码无法更改。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +892,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">密码及确认密码不匹配！</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +904,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">当前密码</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +920,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">密码是必填字段。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +936,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">新密码</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +948,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">新密码</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +960,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">您的密码必须具有至少 4 个字符。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +972,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">密码长度不能超过 50 个字符。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +984,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">新密码确认</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +996,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">确认新密码</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">确认密码是必填字段。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">您的确认密码必须至少具有 4 个字符。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">确认密码长度不能超过 50 个字符。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1044,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">保存</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1054,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">重置密码</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>缺少激活密钥。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>激活密钥无效。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>激活密钥已过期。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">选择新密码</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">密码无法重置。请谨记，密码请求仅在 24 小时内有效。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>密码已重置。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x>请</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">登录</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">验证新密码</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">无法处理您的请求</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">您没有访问此页面的权限。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">此页面不存在。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">密码强度：</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file
diff --git a/ui/src/i18n/messages.zh-TW.xlf b/ui/src/i18n/messages.zh-TW.xlf
index 6835a7cc3..6b5bdb784 100644
--- a/ui/src/i18n/messages.zh-TW.xlf
+++ b/ui/src/i18n/messages.zh-TW.xlf
@@ -59,10 +59,10 @@
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -70,8 +70,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
-        <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
-        <target state="new"> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </target>
+        <source> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </source>
+        <target state="new"> Slide <x id="INTERPOLATION"></x> of <x id="INTERPOLATION_1"></x> </target>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -264,10 +264,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -276,10 +276,10 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION"/>
+          <x id="INTERPOLATION"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/src/ngb-config.ts</context>
@@ -287,8 +287,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="login.messages.error.authentication.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check your credentials and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>登入失敗！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/>請檢查您的憑證並再試一次。</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Failed to sign in!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check your credentials and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>登入失敗！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x>請檢查您的憑證並再試一次。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/login/login.component.html</context>
           <context context-type="linenumber">6</context>
@@ -391,8 +391,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="reset.request.messages.notfound.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Please check and try again. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/> 電子郵件地址尚未登錄！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> 請在檢查後再試一次</target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Email address isn&apos;t registered!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please check and try again. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x> 電子郵件地址尚未登錄！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> 請在檢查後再試一次</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password-reset-init.component.html</context>
           <context context-type="linenumber">7</context>
@@ -463,8 +463,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/> 設定已儲存！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Settings saved!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x> 設定已儲存！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">8</context>
@@ -603,16 +603,16 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.one.string" datatype="html">
-        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
-        <target state="new">安裝雙重認證 app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>您需要一個雙重認證 app 來創建您每次登入帳戶時所需的六位數代碼。多數 app 適用於行動裝置，部分 app 還能在電腦桌面使用，或是使用網頁型 app。下載並安裝您喜歡的雙重認證 app，例如 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"/>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>、<x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"/>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>，或 <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"/>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>。</target>
+        <source> Install a two-factor authentication app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>A 2FA app is required to create the six-digit code you need to access your account each time you sign in. Most apps are for mobile devices; some are also available as desktop or web-based apps. Download and install your preferred 2FA app, such as <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, <x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>, or <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>. </source>
+        <target state="new">安裝雙重認證 app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>您需要一個雙重認證 app 來創建您每次登入帳戶時所需的六位數代碼。多數 app 適用於行動裝置，部分 app 還能在電腦桌面使用，或是使用網頁型 app。下載並安裝您喜歡的雙重認證 app，例如 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&quot; &gt;"></x>Google Authenticator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>、<x id="START_LINK_1" equiv-text="&lt;a href=&quot;https://freeotp.github.io/&quot;&gt;"></x>FreeOTP<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>，或 <x id="START_LINK_2" equiv-text="&lt;a href=&quot;https://authy.com/&quot;&gt;"></x>Authy<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"></x>。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaQrCodeSteps.two.string" datatype="html">
-        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>Open your 2FA app and scan the image below. </source>
-        <target state="new">使用您的裝置掃描此 QR 碼<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>開啟您的雙重認證 app 並掃描下方圖片。</target>
+        <source> Scan this QR code with your device<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>Open your 2FA app and scan the image below. </source>
+        <target state="new">使用您的裝置掃描此 QR 碼<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>開啟您的雙重認證 app 並掃描下方圖片。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">172</context>
@@ -643,8 +643,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="settings.security.mfaTextCodeSteps.one.string" datatype="html">
-        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
-        <target state="new">輸入 app 中的六位數代碼<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"/>掃描 QR 碼或輸入簡訊代碼後，您的雙重認證 app 便會顯示一個六位數代碼，將此代碼輸入下方選框後點擊「儲存」。</target>
+        <source> Enter the six-digit code from the app<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>After scanning the QR code or entering in the text code, your 2FA app will display a six-digit code. Enter this code in the box below and click Save. </source>
+        <target state="new">輸入 app 中的六位數代碼<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br /&gt;"></x>掃描 QR 碼或輸入簡訊代碼後，您的雙重認證 app 便會顯示一個六位數代碼，將此代碼輸入下方選框後點擊「儲存」。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/settings/settings.component.html</context>
           <context context-type="linenumber">203</context>
@@ -867,25 +867,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="password.title.string" datatype="html">
-        <source>Password for <x id="PH" equiv-text="this.username"/> (You)</source>
-        <target state="new">Password for <x id="PH" equiv-text="this.username"/> (You)</target>
-        <note priority="1" from="description">Password label with username param</note>
+        <source>Password for <x id="PH" equiv-text="this.username"></x> (You)</source>
+        <target state="new"> {{username}} 的密碼 （您的）<x id="PH" equiv-text="this.username"></x>undefined</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.success.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/></target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Password changed!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x> 密碼已變更！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
       <trans-unit id="password.messages.error.string" datatype="html">
-        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </source>
-        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> The password could not be changed. </target>
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>An error has occurred!<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> The password could not be changed. </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x> 發生錯誤！<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> 無法變更密碼。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">10</context>
@@ -893,7 +892,11 @@
       </trans-unit>
       <trans-unit id="global.messages.error.dontmatch.string" datatype="html">
         <source> The password and its confirmation do not match! </source>
-        <target state="new"> The password and its confirmation do not match! </target>
+        <target state="new">密碼與確認用密碼不相符！</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">13</context>
@@ -901,7 +904,7 @@
       </trans-unit>
       <trans-unit id="global.form.currentpassword.label.string" datatype="html">
         <source>Current password</source>
-        <target state="new">Current password</target>
+        <target state="new">目前密碼</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">20</context>
@@ -917,7 +920,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.required.string" datatype="html">
         <source> Your password is required. </source>
-        <target state="new"> Your password is required. </target>
+        <target state="new">需要您的密碼。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">84</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">26</context>
@@ -929,7 +936,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.label.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">新密碼</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">32</context>
@@ -937,7 +948,11 @@
       </trans-unit>
       <trans-unit id="global.form.newpassword.placeholder.string" datatype="html">
         <source>New password</source>
-        <target state="new">New password</target>
+        <target state="new">新密碼</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">34</context>
@@ -945,7 +960,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.minlength.string" datatype="html">
         <source> Your password is required to be at least 4 characters. </source>
-        <target state="new"> Your password is required to be at least 4 characters. </target>
+        <target state="new">您的密碼至少必須有 4 個字元。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">43</context>
@@ -953,7 +972,11 @@
       </trans-unit>
       <trans-unit id="global.messages.validate.newpassword.maxlength.string" datatype="html">
         <source> Your password cannot be longer than 50 characters. </source>
-        <target state="new"> Your password cannot be longer than 50 characters. </target>
+        <target state="new">您的密碼不能超過 50 個字元。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">98</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">47</context>
@@ -961,7 +984,11 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.label.string" datatype="html">
         <source>New password confirmation</source>
-        <target state="new">New password confirmation</target>
+        <target state="new">新的確認用密碼</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">54</context>
@@ -969,31 +996,47 @@
       </trans-unit>
       <trans-unit id="global.form.confirmpassword.placeholder.string" datatype="html">
         <source>Confirm the new password</source>
-        <target state="new">Confirm the new password</target>
+        <target state="new">確認新密碼</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">114</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.required.string" datatype="html">
-        <source> Your confirmation password is required. </source>
-        <target state="new"> Your confirmation password is required. </target>
+        <source> Your password confirmation is required. </source>
+        <target state="new">需要您的確認密碼。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">128</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.minlength.string" datatype="html">
-        <source> Your confirmation password is required to be at least 4 characters. </source>
-        <target state="new"> Your confirmation password is required to be at least 4 characters. </target>
+        <source> Your password confirmation is required to be at least 4 characters. </source>
+        <target state="new">您的確認用密碼必須至少為 4 個字元。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">135</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
       <trans-unit id="global.messages.validate.confirmpassword.maxlength.string" datatype="html">
-        <source> Your confirmation password cannot be longer than 50 characters. </source>
-        <target state="new"> Your confirmation password cannot be longer than 50 characters. </target>
+        <source> Your password confirmation cannot be longer than 50 characters. </source>
+        <target state="new">您的確認用密碼長度不能超過 50 個字元。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">142</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">69</context>
@@ -1001,7 +1044,7 @@
       </trans-unit>
       <trans-unit id="password.form.button.string" datatype="html">
         <source>Save</source>
-        <target state="new">Save</target>
+        <target state="new">儲存</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/password/password.component.html</context>
           <context context-type="linenumber">74</context>
@@ -1011,10 +1054,138 @@
         <source>Sorry, an error has occurred</source>
         <target state="new">Sorry, an error has occurred</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/error/error-alert.component.html</context>
+          <context context-type="sourcefile">src/app/error/error-alert.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="reset.finish.title.string" datatype="html">
+        <source>Reset password</source>
+        <target state="new">重設密碼</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keymissing.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>The activation key is missing.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>缺少啟動金鑰<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyinvalid.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation key is invalid.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>啟用金鑰無效。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>This activation has expired.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>啟動金鑰已過期。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph1.string" datatype="html">
+        <source>ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</source>
+        <target state="new">ORCID Member Portal activation links are only valid for 24 hours. It looks like this link has expired.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph2.string" datatype="html">
+        <source>To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</source>
+        <target state="new">To make sure you can activate your Member Portal account we have sent a new activation link to your registered email address.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.keyexpired.paragraph3.string" datatype="html">
+        <source>If you are still having problems activating your account or have not received your new activation link please contact our support team please contact us at membership@orcid.org.</source>
+        <target state="new">If you are still having problems activating your account or have not received your new activation link, please contact us at membership@orcid.org.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.info.string" datatype="html">
+        <source>Choose a new password</source>
+        <target state="new">請選擇一個新密碼</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.error.string" datatype="html">
+        <source> Your password couldn&apos;t be reset. Remember a password request is only valid for 24 hours. </source>
+        <target state="new">無法重設您的密碼。請記得密碼要求只在 24 小時內有效。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.messages.success.string" datatype="html">
+        <source><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>Your password has been reset.<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> Please </source>
+        <target state="new"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"></x>已重設您的密碼。<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"></x> 請</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.info.authenticated.link.string" datatype="html">
+        <source>sign in</source>
+        <target state="new">登入</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="reset.finish.form.button.string" datatype="html">
+        <source> Reset Password </source>
+        <target state="new">認證新密碼</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-reset-finish.component.html</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.title.string" datatype="html">
+        <source>Your request cannot be processed</source>
+        <target state="new">無法處理您的要求</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.403.string" datatype="html">
+        <source> You are not authorized to access this page. </source>
+        <target state="new">您沒有存取此頁面的權限。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="error.http.404.string" datatype="html">
+        <source>The page does not exist.</source>
+        <target state="new">此頁面不存在。</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/error/error.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="global.messages.validate.newpassword.strength.string" datatype="html">
+        <source>Password strength:</source>
+        <target state="new">密碼強度：</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/password/password-strength.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
\ No newline at end of file

From 80bacd8e1a06773ef7e5a1130ec4c7506df93e7b Mon Sep 17 00:00:00 2001
From: Jason Thomas <j.thomas@orcid.org>
Date: Fri, 12 Jan 2024 16:16:56 +0000
Subject: [PATCH 11/19] Add vim apt-package, decrease log level

---
 ui/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/Dockerfile b/ui/Dockerfile
index 8ee2d4399..8621518eb 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /app
 # Install some useful utils for debug/test
 RUN \
     apt-get update && \
-    apt -y install python3 make gcc g++ && \
+    apt -y install python3 make gcc g++ vim && \
     rm -rf /var/lib/apt/lists/*
 
 # Install app dependencies
@@ -19,8 +19,7 @@ COPY package*.json ./
 
 RUN \
     npm config list && \
-    npm config delete proxy && \
-    npm install --loglevel silly
+    npm install
 
 # Bundle app source
 COPY . .

From 4a65f9552fd215431ff4e1a79461cd7794fa6211 Mon Sep 17 00:00:00 2001
From: Jason Thomas <j.thomas@orcid.org>
Date: Fri, 12 Jan 2024 16:17:32 +0000
Subject: [PATCH 12/19] remove accept_language map

---
 ui/container-files/etc/nginx/nginx.conf | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/ui/container-files/etc/nginx/nginx.conf b/ui/container-files/etc/nginx/nginx.conf
index 22027e11c..7b7dbe13c 100644
--- a/ui/container-files/etc/nginx/nginx.conf
+++ b/ui/container-files/etc/nginx/nginx.conf
@@ -25,24 +25,6 @@ http {
 
     #gzip  on;
 
-    # Browser preferred language detection (does NOT require AcceptLanguageModule)
-    # For reference on multi language support see: https://angular.io/guide/i18n-common-deploy#configure-a-server
-    map $http_accept_language $accept_language {
-        default en;
-        ~*^cs cs;
-        ~*^de de;
-        ~*^es es;
-        ~*^fr fr;
-        ~*^it it;
-        ~*^ja ja;
-        ~*^ko ko;
-        ~*^pt pt;
-        ~*^ru ru;
-        ~*^ui ui;
-        ~*^zh-CN zh-CN;
-        ~*^zh-TW zh-TW;
-    }
-
     include /etc/nginx/conf.d/*.conf;
 
 }

From bd89a0068e651718e892774144cbe5561f04b972 Mon Sep 17 00:00:00 2001
From: Jason Thomas <j.thomas@orcid.org>
Date: Fri, 12 Jan 2024 16:21:05 +0000
Subject: [PATCH 13/19] Add langCode map, remove accept_language header
 fallback, replace accept_language header pathing with langCode cookie

---
 .../etc/nginx/conf.d/default.conf             | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/ui/container-files/etc/nginx/conf.d/default.conf b/ui/container-files/etc/nginx/conf.d/default.conf
index c46b77f33..f8c8a1bd9 100644
--- a/ui/container-files/etc/nginx/conf.d/default.conf
+++ b/ui/container-files/etc/nginx/conf.d/default.conf
@@ -1,14 +1,25 @@
+map $ccokie_locale $langCode {
+    default en;
+    ~*^cs cs;
+    ~*^de de;
+    ~*^es es;
+    ~*^fr fr;
+    ~*^it it;
+    ~*^ja ja;
+    ~*^ko ko;
+    ~*^pt pt;
+    ~*^ru ru;
+    ~*^ui ui;
+    ~*^zh-CN zh-CN;
+    ~*^zh-TW zh-TW;
+}
+
 server {
     listen       8090;
     server_name  localhost;
 
     #access_log  /var/log/nginx/host.access.log  main;
 
-    # Fallback to default language if no preference defined by browser
-    if ($accept_language ~ "^$") {
-        set $accept_language "en";
-    }
-
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
@@ -16,11 +27,11 @@ server {
         location ~ ^/ui/(.*) {
             # Redirect requests for `/ui/(.*)` to the Angular application in the preferred language of the browser
             # For reference on multi language support see: https://angular.io/guide/i18n-common-deploy#configure-a-server
-            rewrite  ^/ui/(.*)$ /$accept_language/$1 break;
+            rewrite  ^/ui/(.*)$ /${langCode}/$1 break;
 
             # Configure a fallback route in the NGinX server to serve the index.html when requests arrive for `/ui/login`
             # Requires static html content to have a `base-href=./` entry
-            try_files $uri $uri/ /$accept_language/index.html?$args;
+            try_files $uri $uri/ /${langCode}/index.html?$args;
             
             # Or use the following line instead
             # auto-index on;

From 17a0b89da5f3907074211249930aaa7e48e54257 Mon Sep 17 00:00:00 2001
From: Jason Thomas <j.thomas@orcid.org>
Date: Fri, 12 Jan 2024 20:39:13 +0000
Subject: [PATCH 14/19] typo fix

---
 ui/container-files/etc/nginx/conf.d/default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/container-files/etc/nginx/conf.d/default.conf b/ui/container-files/etc/nginx/conf.d/default.conf
index f8c8a1bd9..c0427993b 100644
--- a/ui/container-files/etc/nginx/conf.d/default.conf
+++ b/ui/container-files/etc/nginx/conf.d/default.conf
@@ -1,4 +1,4 @@
-map $ccokie_locale $langCode {
+map $cookie_locale $langCode {
     default en;
     ~*^cs cs;
     ~*^de de;

From 26a12eeb14bd936c76fd8385627e1d7603a2c5e6 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:47:27 +0200
Subject: [PATCH 15/19] rename method name appropriately

---
 .../app/account/password/password-reset-finish.component.html | 4 ++--
 .../app/account/password/password-reset-finish.component.ts   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/account/password/password-reset-finish.component.html b/ui/src/app/account/password/password-reset-finish.component.html
index 86e29d069..3e75d69f5 100644
--- a/ui/src/app/account/password/password-reset-finish.component.html
+++ b/ui/src/app/account/password/password-reset-finish.component.html
@@ -52,8 +52,8 @@ <h1 i18n="@@reset.finish.title.string">Reset password</h1>
         <a
           class="alert-link"
           tabindex="0"
-          (click)="login()"
-          (keydown.enter)="login()"
+          (click)="navigateToLoginPage()"
+          (keydown.enter)="navigateToLoginPage()"
           i18n="@@global.messages.info.authenticated.link.string"
           >sign in</a
         >.
diff --git a/ui/src/app/account/password/password-reset-finish.component.ts b/ui/src/app/account/password/password-reset-finish.component.ts
index 4133841e5..d7bb68038 100644
--- a/ui/src/app/account/password/password-reset-finish.component.ts
+++ b/ui/src/app/account/password/password-reset-finish.component.ts
@@ -64,7 +64,7 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
     if (password !== confirmPassword) {
       this.doNotMatch = 'ERROR'
     } else {
-      this.passwordService.savePassword({ key: this.key, newPassword: password }).subscribe({
+      this.passwordService.savePassword(this.key!, password).subscribe({
         next: () => {
           this.success = 'OK'
         },
@@ -76,7 +76,7 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
     }
   }
 
-  login() {
+  navigateToLoginPage() {
     this.router.navigate(['/login'])
   }
 }

From 407492e818a829e4f1bf25e11f30caebea93666a Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:47:39 +0200
Subject: [PATCH 16/19] remove unused import

---
 ui/src/app/account/settings/settings.component.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/account/settings/settings.component.spec.ts b/ui/src/app/account/settings/settings.component.spec.ts
index d9af8c81f..fe91413b7 100644
--- a/ui/src/app/account/settings/settings.component.spec.ts
+++ b/ui/src/app/account/settings/settings.component.spec.ts
@@ -5,7 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms'
 import { HttpClientModule, HttpResponse } from '@angular/common/http'
 import { LanguageService } from 'src/app/shared/service/language.service'
 import { AccountService } from '../service/account.service'
-import { of, throwError } from 'rxjs'
+import { of } from 'rxjs'
 import { FindLanguageFromKeyPipe } from 'src/app/shared/pipe/find-language-from-key'
 
 describe('SettingsComponent', () => {

From 8ee37e8a01d767dd20348edc9d0423de471a708e Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:47:57 +0200
Subject: [PATCH 17/19] fix param type

---
 ui/src/app/account/service/password.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/account/service/password.service.ts b/ui/src/app/account/service/password.service.ts
index f64f82c26..ac42c69a0 100644
--- a/ui/src/app/account/service/password.service.ts
+++ b/ui/src/app/account/service/password.service.ts
@@ -26,8 +26,8 @@ export class PasswordService {
     })
   }
 
-  savePassword(keyAndPassword: any): Observable<any> {
-    return this.http.post('/services/userservice/api/account/reset-password/finish', keyAndPassword)
+  savePassword(key: string, newPassword: string): Observable<any> {
+    return this.http.post('/services/userservice/api/account/reset-password/finish', {key, newPassword:"a"})
   }
 
   validateKey(key: any): Observable<KeyValidationResult> {

From 7cbe134b3aa128177de41d6815760e79dbd947cf Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:48:08 +0200
Subject: [PATCH 18/19] clean up

---
 ui/src/app/account/password/password.component.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/account/password/password.component.ts b/ui/src/app/account/password/password.component.ts
index 20690de46..a6852c77b 100644
--- a/ui/src/app/account/password/password.component.ts
+++ b/ui/src/app/account/password/password.component.ts
@@ -43,16 +43,16 @@ export class PasswordComponent implements OnInit {
       this.doNotMatch = 'ERROR'
     } else {
       this.doNotMatch = undefined
-      this.passwordService.updatePassword(newPassword, this.passwordForm.get(['currentPassword'])?.value).subscribe(
-        () => {
+      this.passwordService.updatePassword(newPassword, this.passwordForm.get(['currentPassword'])?.value).subscribe({
+        next: () => {
           this.error = undefined
           this.success = 'OK'
         },
-        () => {
+        error: () => {
           this.success = undefined
           this.error = 'ERROR'
         }
-      )
+    })
     }
   }
 }

From 6e5529a0a9bb16cacb9d3763640a89bf5b396613 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:48:14 +0200
Subject: [PATCH 19/19] add test

---
 .../password-reset-finish.component.spec.ts     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ui/src/app/account/password/password-reset-finish.component.spec.ts b/ui/src/app/account/password/password-reset-finish.component.spec.ts
index c6bdfb4d6..07ee8cfb4 100644
--- a/ui/src/app/account/password/password-reset-finish.component.spec.ts
+++ b/ui/src/app/account/password/password-reset-finish.component.spec.ts
@@ -2,10 +2,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PasswordResetFinishComponent } from './password-reset-finish.component';
 import { AppModule } from 'src/app/app.module';
+import { PasswordService } from '../service/password.service';
+import { of, throwError } from 'rxjs';
 
 describe('PasswordResetFinishComponent', () => {
   let component: PasswordResetFinishComponent;
   let fixture: ComponentFixture<PasswordResetFinishComponent>;
+  let service: PasswordService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -13,6 +16,7 @@ describe('PasswordResetFinishComponent', () => {
       declarations: [PasswordResetFinishComponent]
     });
     fixture = TestBed.createComponent(PasswordResetFinishComponent);
+    service = fixture.debugElement.injector.get(PasswordService)
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
@@ -20,4 +24,17 @@ describe('PasswordResetFinishComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('password should save successfully', () => {
+    spyOn(service, 'savePassword').and.returnValue(of(true))
+    component.finishReset();
+    expect(component.success).toEqual('OK')
+  });
+
+  it('password save should fail', () => {
+    spyOn(service, 'savePassword').and.returnValue(throwError(() => new Error('error')))
+    component.finishReset();
+    expect(component.error).toEqual('ERROR')
+    expect(component.success).toBeFalsy();
+  });
 });