Merge pull request #8879 from fabi1cazenave/confirmPIN-bug854031

bug 854031: missing l10n-id attributes for the “Confirm New PIN” message, r=etienne(cherry picked from commit 452eaff2d2f25eda3addee8833df2aaaf7cbcdd3)
Merge pull request #9210 from fabi1cazenave/uplift-v1train-bug854031

Merge pull request #8879 from fabi1cazenave/confirmPIN-bug854031