diff --git a/client/translations/en.ts b/client/translations/en.ts
index e0ee8edf5..83ece67f0 100644
--- a/client/translations/en.ts
+++ b/client/translations/en.ts
@@ -2912,10 +2912,6 @@ Additional licenses and components
Change PIN%1Change PIN%1
-
- The PUK code cannot be changed on the ID-card in the reader.<br />If you have forgotten the PUK code of your ID-card then you can view it from the Police and Border Guard Board portal.<br /><a href="https://www.id.ee/en/article/pin-and-puk-codes-security-recommendations/">Additional information</a>.
- The PUK code cannot be changed on the ID-card in the reader.<br />If you have forgotten the PUK code of your ID-card then you can view it from the Police and Border Guard Board portal.<br /><a href="https://www.id.ee/en/article/pin-and-puk-codes-security-recommendations/">Additional information</a>.
- PUK code is blocked because the PUK code has been entered 3 times incorrectly.<br/>You can not unblock the PUK code yourself.<br/>As long as the PUK code is blocked, all eID options can be used, except PUK-code.<br/>PUK code is blocked because the PUK code has been entered 3 times incorrectly.<br/>You can not unblock the PUK code yourself.<br/>As long as the PUK code is blocked, all eID options can be used, except PUK-code.<br/>
@@ -3024,6 +3020,10 @@ Additional licenses and components
Please check your internet connection.Please check your internet connection.
+
+ The PUK code of the ID-card inserted in the card reader cannot be changed.<br />If you wish to view your ID-card’s PUK code or have forgotten it, you can do so via the Police and Border Guard Board portal.<br /><a href="https://www.id.ee/en/article/pin-and-puk-codes-security-recommendations/">Additional information</a>.
+ The PUK code of the ID-card inserted in the card reader cannot be changed.<br />If you wish to view your ID-card’s PUK code or have forgotten it, you can do so via the Police and Border Guard Board portal.<br /><a href="https://www.id.ee/en/article/pin-and-puk-codes-security-recommendations/">Additional information</a>.
+ The ID-card must be activated in order to authenticateThe ID-card must be activated in order to authenticate
diff --git a/client/translations/et.ts b/client/translations/et.ts
index b8052a14a..b100836bd 100644
--- a/client/translations/et.ts
+++ b/client/translations/et.ts
@@ -2912,10 +2912,6 @@ Täiendavad litsentsid ja komponendid
Change PIN%1Muuda PIN%1
-
- The PUK code cannot be changed on the ID-card in the reader.<br />If you have forgotten the PUK code of your ID-card then you can view it from the Police and Border Guard Board portal.<br /><a href="https://www.id.ee/en/article/pin-and-puk-codes-security-recommendations/">Additional information</a>.
- Lugejas oleval ID-kaardil ei ole võimalik PUK-koodi muuta.<br />Kui oled unustanud enda ID-kaardi PUK-koodi, siis saad sa seda vaadata Politsei- ja Piirivalveameti iseteenindusest.<br /><a href="https://www.id.ee/artikkel/pin-ja-puk-koodid-soovitused-turvalisuse-tagamiseks/">Lisainfo</a>.
- PUK code is blocked because the PUK code has been entered 3 times incorrectly.<br/>You can not unblock the PUK code yourself.<br/>As long as the PUK code is blocked, all eID options can be used, except PUK-code.<br/>PUK-kood on blokeeritud, kuna PUK-koodi on sisestatud 3 korda valesti.<br/>PUK-koodi ei saa ise lahti blokeerida.<br/>Kuigi PUK-kood on blokeeritud, saab kõiki eID võimalusi kasutada, välja arvatud PUK-koodi vajavaid.<br/>
@@ -3028,6 +3024,10 @@ Täiendavad litsentsid ja komponendid
Change PUKMuuda PUK
+
+ The PUK code of the ID-card inserted in the card reader cannot be changed.<br />If you wish to view your ID-card’s PUK code or have forgotten it, you can do so via the Police and Border Guard Board portal.<br /><a href="https://www.id.ee/en/article/pin-and-puk-codes-security-recommendations/">Additional information</a>.
+ Lugejas oleva ID-kaardi PUK-koodi ei ole võimalik muuta.<br />Kui soovid oma ID-kaardi PUK-koodi vaadata või oled selle unustanud, saad seda teha Politsei- ja Piirivalveameti iseteeninduses.<br /><a href="https://www.id.ee/artikkel/pin-ja-puk-koodid-soovitused-turvalisuse-tagamiseks/">Lisainfo</a>.
+ PIN can be changed only using eToken utilityPIN-koodi saab muuta ainult e-Templi tarkvaraga
diff --git a/client/widgets/VerifyCert.cpp b/client/widgets/VerifyCert.cpp
index 29b95ff94..7207d0b7f 100644
--- a/client/widgets/VerifyCert.cpp
+++ b/client/widgets/VerifyCert.cpp
@@ -146,7 +146,7 @@ void VerifyCert::update()
ui->validUntil->setLabel({});
ui->validUntil->setText(tr("The PUK code is located in your envelope"));
- ui->validUntil->setHidden(isBlockedPuk);
+ ui->validUntil->setHidden(isBlockedPuk || !isPUKReplacable);
ui->changePIN->setText(tr("Change PUK"));
ui->changePIN->setHidden(isBlockedPuk || !isPUKReplacable);
@@ -166,9 +166,9 @@ void VerifyCert::update()
else if(!isPUKReplacable)
{
ui->info->setLabel({});
- ui->info->setText(tr("The PUK code cannot be changed on the ID-card in the reader. "
- "If you have forgotten the PUK code of your ID-card then you can view it from the Police and Border Guard Board portal. "
- "Additional information."));
+ ui->info->setText(tr("The PUK code of the ID-card inserted in the card reader cannot be changed. "
+ "If you wish to view your ID-card’s PUK code or have forgotten it, you can do so via the Police and Border Guard Board portal. "
+ "Additional information."));
}
} else {
if(pinType == QSmartCardData::Pin2Type)