po: msgmerge done

--

25 files changed, 256 insertions, 162 deletions

diff --git a/po/ca.po b/po/ca.po
index 3add69bb1..d6840dbc1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -784,11 +784,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "error en la lectura de «%s»: %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -4116,6 +4111,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 # Photo ID com abans.  ivb
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
@@ -8289,6 +8288,11 @@ msgstr ""
 msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
 # No em passe! ;)  ivb
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
diff --git a/po/cs.po b/po/cs.po
index d72bd673f..c790c768b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -762,10 +762,6 @@ msgid "Wrong"
 msgstr "Špatně"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "chyba při přejmenování „%s“ na „%s“: %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Poznámka: Toto heslo nikdy nebylo změněno.%0AProsím, nyní jej změňte."
 
@@ -3809,6 +3805,11 @@ msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Dobu platnosti také můžete změnit.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -7832,6 +7833,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "vytvoření dočasného kešového dir souboru „%s“ selhalo: %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "chyba při přejmenování „%s“ na „%s“: %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nelze vypočítat haš „%s“: %s\n"
 
diff --git a/po/da.po b/po/da.po
index 404d79eb4..011ea7d0d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -835,11 +835,6 @@ msgstr "Korrekt"
 msgid "Wrong"
 msgstr "Forkert"
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "fejl ved læsning af »%s«: %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Bemærk: Denne adgangsfrase er aldrig blevet ændret.%0AÆndr den nu."
@@ -4129,6 +4124,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8373,6 +8372,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "fejl ved læsning af »%s«: %s\n"
+
+#, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't hash '%s': %s\n"
 msgstr "kan ikke tilgå »%s«: %s\n"
diff --git a/po/el.po b/po/el.po
index a45232fd8..7d4e8e738 100644
--- a/po/el.po
+++ b/po/el.po
@@ -751,11 +751,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -4013,6 +4008,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8128,6 +8127,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
diff --git a/po/eo.po b/po/eo.po
index e9b007c41..a142ce1aa 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -750,11 +750,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -3986,6 +3981,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8039,6 +8038,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
diff --git a/po/es.po b/po/es.po
index 03e50d3ca..4409ce443 100644
--- a/po/es.po
+++ b/po/es.po
@@ -789,10 +789,6 @@ msgid "Wrong"
 msgstr "Incorrecto"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "error al renombrar '%s' a '%s': %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Nota: Esta frase contraseña nunca ha sido cambiada.%0APor favor hágalo ahora."
@@ -3886,6 +3882,11 @@ msgstr "AVISO: Tu subclave de cifrado caduca pronto.\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Puede que también quieras cambiar su fecha de caducidad.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "AVISO: Tu subclave de cifrado caduca pronto.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -7955,6 +7956,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "no se puede crear el fichero de cache '%s': %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error al renombrar '%s' a '%s': %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "no se puede hacer el hash de '%s': %s\n"
 
diff --git a/po/et.po b/po/et.po
index 6c6f7bfbb..5e106d6f5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -748,11 +748,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -3985,6 +3980,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8045,6 +8044,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
diff --git a/po/fi.po b/po/fi.po
index 15fd0471a..3af8e811e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -765,11 +765,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -4009,6 +4004,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8111,6 +8110,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index 239307ec4..6530e7768 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -790,10 +790,6 @@ msgid "Wrong"
 msgstr "Faux"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "erreur en renommant « %s » en « %s » : %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Remarque : cette phrase secrète n'a jamais été modifiée.%0AVeuillez la "
@@ -4015,6 +4011,11 @@ msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8259,6 +8260,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "impossible de créer le répertoire de cache temporaire « %s » : %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "erreur en renommant « %s » en « %s » : %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "impossible de hacher « %s » : %s\n"
 
diff --git a/po/gl.po b/po/gl.po
index af75e558c..d6972580a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -753,11 +753,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "erro lendo `%s': %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -4009,6 +4004,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8119,6 +8118,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
diff --git a/po/hu.po b/po/hu.po
index b506d8a68..e875d074b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -748,11 +748,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "Hiba \"%s\" olvasásakor: %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -3986,6 +3981,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8072,6 +8071,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "Hiba \"%s\" olvasásakor: %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
 
diff --git a/po/id.po b/po/id.po
index 5334da392..363bad315 100644
--- a/po/id.po
+++ b/po/id.po
@@ -753,11 +753,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -3992,6 +3987,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8071,6 +8070,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
diff --git a/po/it.po b/po/it.po
index 85f9b817c..8f04c7afa 100644
--- a/po/it.po
+++ b/po/it.po
@@ -738,10 +738,6 @@ msgid "Wrong"
 msgstr "Sbagliato"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "errore durante la ridenominazione di '%s' in '%s': %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Nota: questa passphrase non è mai stata modificata.%0ASi prega di cambiarlo "
@@ -3826,6 +3822,11 @@ msgstr "AVVISO: la sottochiave di crittografia scade a breve.\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Si consiglia di modificare anche la sua data di scadenza.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "AVVISO: la sottochiave di crittografia scade a breve.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -7884,6 +7885,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "impossibile creare il file dir della cache temporanea '%s': %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "errore durante la ridenominazione di '%s' in '%s': %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "impossibile eseguire l'hashing '%s': %s\n"
 
diff --git a/po/ja.po b/po/ja.po
index 236d78ced..d9a1dcd71 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -226,8 +226,8 @@ msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
-"パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A   "
-"%s%%0A   %s%%0Aを保護します。"
+"パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A   %s"
+"%%0A   %s%%0Aを保護します。"
 
 #, c-format
 msgid "failed to create stream from socket: %s\n"
@@ -728,10 +728,6 @@ msgid "Wrong"
 msgstr "誤り"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "'%s'から'%s'へ名前変更のエラー: %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注意: パスフレーズは変更されていません。%0A今、変更してください。"
 
@@ -759,8 +755,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  "
-"%%C%%0A?"
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
 msgstr "本当にこの鍵: keygrip%%0A  %s%%0A  %%C%%0Aを削除しますか?"
 
 msgid "Delete key"
@@ -7589,6 +7585,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "一時キャッシュ・ディレクトリ・ファイル'%s'が作成できません: %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "'%s'から'%s'へ名前変更のエラー: %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "'%s'をハッシュできません: %s\n"
 
diff --git a/po/nb.po b/po/nb.po
index 19c2a4d19..922cb4957 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -750,10 +750,6 @@ msgid "Wrong"
 msgstr "Feil"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Merk: denne passordfrasen har aldri blitt endret.%0AEndre den umiddelbart."
@@ -3849,6 +3845,11 @@ msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du bør vurdere å endre utløpsdato samtidig.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -7874,6 +7875,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "klarte ikke å lage midlertidig hurtiglagermappe-fil «%s»: %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "klarte ikke å summere «%s»: %s\n"
 
diff --git a/po/pl.po b/po/pl.po
index dd97fdbdc..555da9661 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -745,10 +745,6 @@ msgid "Wrong"
 msgstr "Odrzuć"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "błąd zmiany nazwy ,,%s'' na ,,%s'': %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Uwaga: To hasło nie było nigdy zmieniane.%0AProszę zmienić je teraz."
 
@@ -3862,6 +3858,11 @@ msgstr "OSTRZEŻENIE: podklucz do szyfrowania wkrótce wygaśnie.\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Może warto także zmienić jego datę ważności.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "OSTRZEŻENIE: podklucz do szyfrowania wkrótce wygaśnie.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -7983,6 +7984,10 @@ msgstr ""
 "%s'': %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "błąd zmiany nazwy ,,%s'' na ,,%s'': %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nie można policzyć skrótu ,,%s'': %s\n"
 
diff --git a/po/pt.po b/po/pt.po
index d20eb0138..e7ba4118c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -752,11 +752,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -3996,6 +3991,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8068,6 +8067,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index e60784d33..b32a1dcd5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -762,11 +762,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "eroare la citire `%s': %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -4044,6 +4039,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8194,6 +8193,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't hash '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
diff --git a/po/ru.po b/po/ru.po
index 80e4e7aa6..a144acd53 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -755,10 +755,6 @@ msgid "Wrong"
 msgstr "Неверно"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "ошибка переименования '%s' в '%s': %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Замечание: Фразу-пароль никогда не меняли.%0AПожалуйста, смените ее сейчас."
@@ -3866,6 +3862,11 @@ msgstr "Внимание: Срок действия Вашего подключ�
 msgid "You may want to change its expiration date too.\n"
 msgstr "Возможно, надо поменять также срок действия.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -7943,6 +7944,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "невозможно создание временного файла '%s': %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "ошибка переименования '%s' в '%s': %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "невозможно получить хеш '%s': %s\n"
 
diff --git a/po/sk.po b/po/sk.po
index 50e9070b8..743ce6b0a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -753,11 +753,6 @@ msgstr ""
 msgid "Wrong"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "chyba pri čítaní `%s': %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -4012,6 +4007,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8102,6 +8101,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "chyba pri čítaní `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index c8405d50c..2a62fe1d7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -851,11 +851,6 @@ msgstr "Korrekt"
 msgid "Wrong"
 msgstr "Fel"
 
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "fel vid läsning av \"%s\": %s\n"
-
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
@@ -4194,6 +4189,10 @@ msgstr ""
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
+#, c-format
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8507,6 +8506,11 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
 #, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't hash '%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
diff --git a/po/tr.po b/po/tr.po
index 3f15ce679..b7730c7ae 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,12 +1,12 @@
 # Turkish translations for GnuPG messages.
 # Nilgün Belma Bugüner <[email protected]>, 2001-2008,
-# Emir SARI <[email protected]>, 2022
+# Emir SARI <[email protected]>, 2022, 2023
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 2.3.4\n"
+"Project-Id-Version: gnupg 2.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"PO-Revision-Date: 2022-04-23 15:00+0300\n"
+"PO-Revision-Date: 2023-02-05 18:00+0300\n"
 "Last-Translator: Emir SARI <[email protected]>\n"
 "Language-Team: Turkish\n"
 "Language: tr\n"
@@ -14,7 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
@@ -325,7 +324,7 @@ msgstr "Yine de bunu kullan"
 
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
-msgstr "Yeni anahtarınızı korumak için lütfen%0Aanahtar parolanızı girin"
+msgstr "Yeni anahtarınızı korumak için lütfen anahtar%0Aparolanızı girin"
 
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
@@ -393,10 +392,8 @@ msgstr "|ALGO|ssh parmak izlerini göstermek için ALGO kullan"
 msgid "enable putty support"
 msgstr "putty desteğini etkinleştir"
 
-#, fuzzy
-#| msgid "enable putty support"
 msgid "enable Win32-OpenSSH support"
-msgstr "putty desteğini etkinleştir"
+msgstr "Win32-OpenSSH desteğini etkinleştir"
 
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
@@ -737,10 +734,6 @@ msgid "Wrong"
 msgstr "Yanlış"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "'%s > '%s' olarak yeniden adlandırırken hata: %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Not: Bu anahtar parolası hiç değiştirilmedi.%0ALütfen şimdi değiştirin."
@@ -763,22 +756,19 @@ msgid "Please insert the card with serial number"
 msgstr "Lütfen seri numarayı içeren kartı takın"
 
 # Check
-#, fuzzy, c-format
-#| msgid ""
-#| "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want "
-#| "to allow this?"
+#, c-format
 msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
 msgstr ""
-"Bir ssh işlemi,%%0A  %s%%A  (%s)%%0Aanahtarının kullanımı için istekte "
-"bulundu. Buna izin vermek istiyor musunuz?"
+"%%0A  %s%%0A  %s%%0Aanahtarının kullanımı için istekte bulunuldu. Buna izin "
+"vermek istiyor musunuz?"
 
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr ""
-"Anahtar maşası tarafından tanımlanan şu anahtarı silmek istediğnizden emin "
-"misiniz:%%0A  %s%%0A  %%C%%0A?"
+"%%0A  %s%%0A  %%C%%0A anahtar maşası tarafından tanımlanan anahtarı silmek "
+"istediğnizden emin misiniz?"
 
 msgid "Delete key"
 msgstr "Anahtarı sil"
@@ -1516,7 +1506,7 @@ msgstr "%u bite yuvarlandı\n"
 
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s anahtar uzunlukları %u-%u eriminde olmalı\n"
+msgstr "%s anahtar uzunlukları %u-%u eriminde olmalıdır\n"
 
 msgid "Changing card key attribute for: "
 msgstr "Şunun için anahtar özniteliği değiştiriliyor: "
@@ -1531,7 +1521,7 @@ msgid "Authentication key\n"
 msgstr "Kimlik doğrulama anahtarı\n"
 
 msgid "Please select what kind of key you want:\n"
-msgstr "Lütfen istediğiniz anahtar türünü seçiniz:\n"
+msgstr "Lütfen istediğiniz anahtar türünü seçin:\n"
 
 #, c-format
 msgid "   (%d) RSA\n"
@@ -1574,7 +1564,7 @@ msgid "Note: keys are already stored on the card!\n"
 msgstr "Not: Anahtarlar halihazırda kart üzerinde depolanıyor!\n"
 
 msgid "Replace existing keys? (y/N) "
-msgstr "Mevcut anahtarlar başkalarıyla değiştirilsin mi? (e/H) "
+msgstr "Var olan anahtarlar başkalarıyla değiştirilsin mi? (e/H) "
 
 #, c-format
 msgid ""
@@ -1587,7 +1577,7 @@ msgstr ""
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
 msgid "Please select the type of key to generate:\n"
-msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
+msgstr "Lütfen üretilecek anahtar türünü seçin:\n"
 
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
@@ -1599,7 +1589,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik doğrulama anahtarı\n"
 
 msgid "Please select where to store the key:\n"
-msgstr "Lütfen anahtarın depolanacağı yeri seçiniz:\n"
+msgstr "Lütfen anahtarın depolanacağı yeri seçin:\n"
 
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
@@ -1803,10 +1793,9 @@ msgstr "UYARI: %s anahtarı, %s kipinde şifreleme için uygun değil\n"
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#, fuzzy, c-format
-#| msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#, c-format
 msgid "can't use a SKESK packet due to the S2K mode\n"
-msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
+msgstr "S2K kipi nedeniyle bir SKESK paketi kullanılamıyor\n"
 
 #, c-format
 msgid "using cipher %s.%s\n"
@@ -1877,18 +1866,14 @@ msgstr "dışa aktarım sırasında anahtardan kullanışsız parçaları kaldı
 msgid "remove as much as possible from key during export"
 msgstr "dışa aktarım sırasında anahtardan olabildiğince çok şey kaldır"
 
-#, fuzzy
-#| msgid "generate a revocation certificate"
 msgid "export only revocation certificates"
-msgstr "bir yürürlükten kaldırma sertifikası üret"
+msgstr "yalnızca yürürlükten kaldırma sertifikalarını dışa aktar"
 
 msgid "use the GnuPG key backup format"
 msgstr "GnuPG yedekleme biçimini kullan"
 
-#, fuzzy
-#| msgid "exporting secret keys not allowed\n"
 msgid "export secret keys using the GnuPG format"
-msgstr "gizli anahtarların dışa aktarımına izin verilmez\n"
+msgstr "GnuPG biçimini kullanan gizli anahtarları dışa aktar"
 
 msgid " - skipped"
 msgstr " - atlandı"
@@ -2330,10 +2315,8 @@ msgstr "anahtar zinciri adını anahtar listelerinde göster"
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zaman aşımı tarihleri göster"
 
-#, fuzzy
-#| msgid "list preferences (expert)"
 msgid "show preferences"
-msgstr "tercihleri listele (uzman)"
+msgstr "tercihleri göster"
 
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2503,23 +2486,23 @@ msgstr "seçili sertifikalama özet algoritması geçersiz\n"
 
 #, c-format
 msgid "completes-needed must be greater than 0\n"
-msgstr "\"completes-needed\" 0'dan büyük olmalı\n"
+msgstr "\"completes-needed\" 0'dan büyük olmalıdır\n"
 
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
-msgstr "\"marginals-needed\" 1'den büyük olmalı\n"
+msgstr "\"marginals-needed\" 1'den büyük olmalıdır\n"
 
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "\"max-cert-depth\" 1-255 arasında olmalı\n"
+msgstr "\"max-cert-depth\" 1-255 arasında olmalıdır\n"
 
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "öntanımlı sertifika düzeyi geçersiz; 0, 1, 2 veya 3 olmalı\n"
+msgstr "öntanımlı sertifika düzeyi geçersiz; 0, 1, 2 veya 3 olmalıdır\n"
 
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "asgari sertifika düzeyi geçersiz; 1, 2 veya 3 olmalı\n"
+msgstr "en küçük sertifika düzeyi geçersiz; 1, 2 veya 3 olmalıdır\n"
 
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
@@ -2527,7 +2510,7 @@ msgstr "Not: Basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "geçersiz S2K kipi; 0, 1 veya 3 olmalı\n"
+msgstr "geçersiz S2K kipi; 0, 1 veya 3 olmalıdır\n"
 
 #, c-format
 msgid "invalid default preferences\n"
@@ -3800,6 +3783,11 @@ msgstr "UYARI: Şifreleme yardımcı anahtarının yakın zamanda süresi dolaca
 msgid "You may want to change its expiration date too.\n"
 msgstr "Son kullanma tarihini de değiştirmek isteyebilirsiniz.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "UYARI: Şifreleme yardımcı anahtarının yakın zamanda süresi dolacak.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4249,7 +4237,7 @@ msgstr "%u bite yuvarlandı\n"
 
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
-msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
+msgstr "%s anahtarları %u bit ile %u bit arasında olmalıdır.\n"
 
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
@@ -4303,10 +4291,10 @@ msgid "invalid value\n"
 msgstr "geçersiz değer\n"
 
 msgid "Key does not expire at all\n"
-msgstr "Anahtar hep geçerli olacak\n"
+msgstr "Anahtarın geçerliliği hiçbir zaman bitmeyecek\n"
 
 msgid "Signature does not expire at all\n"
-msgstr "İmza hep geçerli olacak\n"
+msgstr "İmzanın geçerliliği hiçbir zaman bitmeyecek\n"
 
 #, c-format
 msgid "Key expires at %s\n"
@@ -5248,7 +5236,7 @@ msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
-"Bu anahtar için asgari güvence düzeyi: %s\n"
+"Bu anahtar için en düşük güvence düzeyi: %s\n"
 "\n"
 
 msgid "Your decision? "
@@ -6662,7 +6650,7 @@ msgstr "||Lütfen kart kilidini açın"
 
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
+msgstr "CHV%d için PIN çok kısa; gereken en kısa uzunluk %d\n"
 
 #, c-format
 msgid "verify CHV%d failed: %s\n"
@@ -6693,7 +6681,7 @@ msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
-msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
+msgstr "Sıfırlama Kodu çok kısa; gereken en kısa uzunluk %d\n"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
@@ -7783,6 +7771,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "geçici önbellek dizin dosyası '%s' oluşturulamadı: %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "'%s > '%s' olarak yeniden adlandırırken hata: %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "'%s' sağlaması yapılamıyor: %s\n"
 
diff --git a/po/uk.po b/po/uk.po
index d81fd7d64..730e9e135 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -755,10 +755,6 @@ msgid "Wrong"
 msgstr "Не підтверджую"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "помилка під час спроби перейменування «%s» на «%s»: %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Зауваження: цей пароль ще не змінювався.%0AБудь ласка, змініть його зараз."
@@ -3905,6 +3901,11 @@ msgstr "УВАГА: строк дії вашого підключа імпорт
 msgid "You may want to change its expiration date too.\n"
 msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -8053,6 +8054,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "не вдалося створити тимчасовий файл каталогу кешу «%s»: %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "помилка під час спроби перейменування «%s» на «%s»: %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "не вдалося хешувати «%s»: %s\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1b6a221d9..ef737a37d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -718,10 +718,6 @@ msgid "Wrong"
 msgstr "错误"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "将‘%s’重命名为‘%s’时出现错误：%s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注意：此密码从未被修改过。%0A请立即修改。"
 
@@ -3692,6 +3688,11 @@ msgstr "警告： 您的加密用子密钥将在不久后过期。\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "您可能也想要变更它的过期日期。\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "警告： 您的加密用子密钥将在不久后过期。\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -7529,6 +7530,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "创建临时缓存目录文件‘%s’时失败：%s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "将‘%s’重命名为‘%s’时出现错误：%s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "无法取‘%s’的散列：%s\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 066dd0521..f14cce879 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -754,10 +754,6 @@ msgid "Wrong"
 msgstr "錯了"
 
 #, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "把 '%s' 重新命名成 '%s' 時出錯: %s\n"
-
-#, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "請注意: 密語從未變更過.%0A請現在就變更."
 
@@ -3882,6 +3878,11 @@ msgstr "警告: 你的加密子鑰很快將到期.\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "你可能也會想變更其使用期限.\n"
 
+#, fuzzy, c-format
+#| msgid "WARNING: Your encryption subkey expires soon.\n"
+msgid "WARNING: No valid encryption subkey left over.\n"
+msgstr "警告: 你的加密子鑰很快將到期.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -7872,6 +7873,10 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "建立暫存快取目錄檔案 '%s' 失敗: %s\n"
 
 #, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "把 '%s' 重新命名成 '%s' 時出錯: %s\n"
+
+#, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "無法計算 '%s' 的雜湊: %s\n"