Update some po files.

6 files changed, 3574 insertions, 2473 deletions

diff --git a/po/cs.po b/po/cs.po
index f12fae4..726dd92 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cryptsetup 1.5.0-rc2\n"
+"Project-Id-Version: cryptsetup 1.5.1\n"
 "Report-Msgid-Bugs-To: dm-crypt@saout.de\n"
-"POT-Creation-Date: 2012-06-20 11:31+0200\n"
-"PO-Revision-Date: 2012-06-25 20:58+0200\n"
+"POT-Creation-Date: 2012-09-19 15:48+0200\n"
+"PO-Revision-Date: 2012-10-14 20:33+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
@@ -23,11 +23,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: lib/libdevmapper.c:199
+#: lib/libdevmapper.c:230
+msgid "Cannot initialize device-mapper, running as non-root user.\n"
+msgstr "Nelze inicializovat device-mapper, nespuštěno superuživatelem.\n"
+
+#: lib/libdevmapper.c:233
 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n"
 msgstr "Nelze inicializovat device-mapper. Je jaderný modul dm_mod zaveden?\n"
 
-#: lib/libdevmapper.c:492
+#: lib/libdevmapper.c:516
 #, c-format
 msgid "DM-UUID for device %s was truncated.\n"
 msgstr "DM-UUID pro zařízení %s bylo zkráceno.\n"
@@ -59,329 +63,266 @@ msgstr "Požadována neznámá kvalita generátoru náhodných čísel.\n"
 msgid "Error %d reading from RNG: %s\n"
 msgstr "Chyba %d při čtení z generátoru náhodných čísel: %s\n"
 
-#: lib/setup.c:172
+#: lib/setup.c:179
 msgid "Cannot initialize crypto RNG backend.\n"
 msgstr "Implementaci šifrovacího generátoru náhodných čísel nelze inicializovat.\n"
 
-#: lib/setup.c:178
+#: lib/setup.c:185
 msgid "Cannot initialize crypto backend.\n"
 msgstr "Implementaci šifrování nelze inicializovat.\n"
 
-#: lib/setup.c:201 lib/setup.c:1096 lib/verity/verity.c:119
+#: lib/setup.c:208 lib/setup.c:1060 lib/verity/verity.c:120
 #, c-format
 msgid "Hash algorithm %s not supported.\n"
 msgstr "Hašovací algoritmus %s není podporován.\n"
 
-#: lib/setup.c:204 lib/loopaes/loopaes.c:88
+#: lib/setup.c:211 lib/loopaes/loopaes.c:88
 #, c-format
 msgid "Key processing error (using hash %s).\n"
 msgstr "Chyba zpracování klíče (za použití haše %s).\n"
 
-#: lib/setup.c:245
+#: lib/setup.c:252
 msgid "All key slots full.\n"
 msgstr "Všechny pozice klíčů jsou obsazeny.\n"
 
-#: lib/setup.c:252
+#: lib/setup.c:259
 #, c-format
 msgid "Key slot %d is invalid, please select between 0 and %d.\n"
 msgstr "Pozice klíče %d není platná, prosím, vyberte číslo mezi 0 a %d.\n"
 
-#: lib/setup.c:258
+#: lib/setup.c:265
 #, c-format
 msgid "Key slot %d is full, please select another one.\n"
 msgstr "Pozice klíče %d je obsazena, prosím, vyberte jinou.\n"
 
-#: lib/setup.c:372
+#: lib/setup.c:379
 #, c-format
 msgid "Enter passphrase for %s: "
 msgstr "Zadejte heslo pro %s: "
 
-#: lib/setup.c:521
-msgid "Cannot find a free loopback device.\n"
-msgstr "Nelze najít volné zařízení zpětné smyčky.\n"
-
-#: lib/setup.c:528
-msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
-msgstr ""
-"Připojení zařízení zpětné smyčky selhalo (požadováno zařízení s příznakem\n"
-"autoclear).\n"
-
-#: lib/setup.c:601
+#: lib/setup.c:560
 #, c-format
 msgid "Header detected but device %s is too small.\n"
 msgstr "Nalezena hlavička, ale zařízení %s je příliš malé.\n"
 
-#: lib/setup.c:617 lib/setup.c:1312
+#: lib/setup.c:576 lib/setup.c:1278
 msgid "This operation is not supported for this device type.\n"
 msgstr "Tato operace není na zařízení tohoto typu podporována.\n"
 
-#: lib/setup.c:829 lib/setup.c:1276 lib/setup.c:2076
+#: lib/setup.c:782 lib/setup.c:1242 lib/setup.c:2034
 #, c-format
 msgid "Device %s is not active.\n"
 msgstr "Zařízení %s není aktivní.\n"
 
-#: lib/setup.c:846
+#: lib/setup.c:799
 #, c-format
 msgid "Underlying device for crypt device %s disappeared.\n"
 msgstr "Zařízení nižší úrovně pod šifrovaným zařízením %s zmizelo.\n"
 
-#: lib/setup.c:909
+#: lib/setup.c:862
 msgid "Invalid plain crypt parameters.\n"
 msgstr "Neplatné parametry plain šifry.\n"
 
-#: lib/setup.c:914 lib/setup.c:1025
+#: lib/setup.c:867 lib/setup.c:989
 msgid "Invalid key size.\n"
 msgstr "Neplatná velikost klíče.\n"
 
-#: lib/setup.c:958
+#: lib/setup.c:911
 msgid "Can't format LUKS without device.\n"
 msgstr "LUKS nelze bez zařízení naformátovat.\n"
 
-#: lib/setup.c:999
+#: lib/setup.c:959
 #, c-format
 msgid "Cannot format device %s which is still in use.\n"
 msgstr "Zařízení %s, které se stále používá, nelze formátovat.\n"
 
-#: lib/setup.c:1002
+#: lib/setup.c:962
+#, c-format
+msgid "Cannot format device %s, permission denied.\n"
+msgstr "Zařízení %s nelze formátovat, povolení zamítnuto.\n"
+
+#: lib/setup.c:966
 #, c-format
 msgid "Cannot wipe header on device %s.\n"
 msgstr "Ze zařízení %s nelze odstranit hlavičku.\n"
 
-#: lib/setup.c:1020
+#: lib/setup.c:984
 msgid "Can't format LOOPAES without device.\n"
 msgstr "LOOPAES nelze bez zařízení naformátovat.\n"
 
-#: lib/setup.c:1056
+#: lib/setup.c:1020
 msgid "Can't format VERITY without device.\n"
 msgstr "VERITY nelze bez zařízení naformátovat.\n"
 
-#: lib/setup.c:1064 lib/verity/verity.c:102
+#: lib/setup.c:1028 lib/verity/verity.c:103
 #, c-format
 msgid "Unsupported VERITY hash type %d.\n"
 msgstr "Nepodporovaný druh VERITY haše %d.\n"
 
-#: lib/setup.c:1070 lib/verity/verity.c:110
+#: lib/setup.c:1034 lib/verity/verity.c:111
 msgid "Unsupported VERITY block size.\n"
 msgstr "Nepodporovaná velikost bloku VERITY.\n"
 
-#: lib/setup.c:1075 lib/verity/verity.c:73
+#: lib/setup.c:1039 lib/verity/verity.c:74
 msgid "Unsupported VERITY hash offset.\n"
 msgstr "Nepodporovaná poloha haše VERITY.\n"
 
-#: lib/setup.c:1185
+#: lib/setup.c:1151
 #, c-format
 msgid "Unknown crypt device type %s requested.\n"
 msgstr "Požadován neznámý typ šifrovaného zařízení %s.\n"
 
-#: lib/setup.c:1327
+#: lib/setup.c:1293
 msgid "Do you really want to change UUID of device?"
 msgstr "Opravdu chcete změnit UUID zařízení?"
 
-#: lib/setup.c:1418 lib/setup.c:1465 lib/setup.c:1514 lib/setup.c:1580
-#: lib/setup.c:1656 lib/setup.c:1737 lib/setup.c:1783 lib/setup.c:2141
-#: lib/setup.c:2419
+#: lib/setup.c:1379 lib/setup.c:1424 lib/setup.c:1473 lib/setup.c:1539
+#: lib/setup.c:1615 lib/setup.c:1696 lib/setup.c:1742 lib/setup.c:2099
+#: lib/setup.c:2382
 msgid "This operation is supported only for LUKS device.\n"
 msgstr "Tato operace je podporována jen u zařízení LUKS.\n"
 
-#: lib/setup.c:1425
+#: lib/setup.c:1386
 #, c-format
 msgid "Volume %s is not active.\n"
 msgstr "Svazek %s není aktivní.\n"
 
-#: lib/setup.c:1437
+#: lib/setup.c:1397
 #, c-format
 msgid "Volume %s is already suspended.\n"
 msgstr "Svazek %s je již uspán.\n"
 
-#: lib/setup.c:1475 lib/setup.c:1524
+#: lib/setup.c:1434 lib/setup.c:1483
 #, c-format
 msgid "Volume %s is not suspended.\n"
 msgstr "Svazek %s není uspán.\n"
 
-#: lib/setup.c:1531 lib/setup.c:1908 lib/setup.c:1922 src/cryptsetup.c:343
+#: lib/setup.c:1490 lib/setup.c:1867 lib/setup.c:1881 src/cryptsetup.c:194
 msgid "Enter passphrase: "
 msgstr "Zadejte heslo: "
 
-#: lib/setup.c:1594 lib/setup.c:1670
+#: lib/setup.c:1553 lib/setup.c:1629
 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n"
 msgstr ""
 "Nelze přidat pozici klíče, všechny pozice jsou zakázány a klíč svazku\n"
 "nebyl poskytnut.\n"
 
-#: lib/setup.c:1603 lib/setup.c:1676 lib/setup.c:1680
+#: lib/setup.c:1562 lib/setup.c:1635 lib/setup.c:1639
 msgid "Enter any passphrase: "
 msgstr "Zadejte jakékoliv heslo: "
 
-#: lib/setup.c:1620 lib/setup.c:1693 lib/setup.c:1697 lib/setup.c:1760
+#: lib/setup.c:1579 lib/setup.c:1652 lib/setup.c:1656 lib/setup.c:1719
 msgid "Enter new passphrase for key slot: "
 msgstr "Zadejte nové heslo pro pozici klíče: "
 
-#: lib/setup.c:1751 lib/setup.c:2012 lib/setup.c:2025 lib/setup.c:2152
+#: lib/setup.c:1710 lib/setup.c:1971 lib/setup.c:1984 lib/setup.c:2110
 msgid "Volume key does not match the volume.\n"
 msgstr "Heslo svazku neodpovídá svazku.\n"
 
-#: lib/setup.c:1789
+#: lib/setup.c:1748
 #, c-format
 msgid "Key slot %d is invalid.\n"
 msgstr "Pozice klíče %d je neplatná.\n"
 
-#: lib/setup.c:1794
+#: lib/setup.c:1753
 #, c-format
 msgid "Key slot %d is not used.\n"
 msgstr "Pozice klíče %d není použita.\n"
 
-#: lib/setup.c:1824 lib/setup.c:1896 lib/setup.c:1988
+#: lib/setup.c:1783 lib/setup.c:1855 lib/setup.c:1947
 #, c-format
 msgid "Device %s already exists.\n"
 msgstr "Zařízení %s již existuje.\n"
 
-#: lib/setup.c:1999
+#: lib/setup.c:1958
 msgid "Incorrect volume key specified for plain device.\n"
 msgstr "Byl zadán neplatný klíč svazku.\n"
 
-#: lib/setup.c:2032
+#: lib/setup.c:1991
 msgid "Incorrect root hash specified for verity device.\n"
 msgstr "K zařízení VERITY byl zadán neplatný kořenový haš.\n"
 
-#: lib/setup.c:2051
+#: lib/setup.c:2009
 msgid "Device type is not properly initialised.\n"
 msgstr "Typ zařízení není řádně inicializován.\n"
 
-#: lib/setup.c:2080
+#: lib/setup.c:2038
 #, c-format
 msgid "Invalid device %s.\n"
 msgstr "Neplatné zařízení %s.\n"
 
-#: lib/setup.c:2108
+#: lib/setup.c:2066
 msgid "Volume key buffer too small.\n"
 msgstr "Vyhrazená paměť pro klíč svazku je příliš malá.\n"
 
-#: lib/setup.c:2116
+#: lib/setup.c:2074
 msgid "Cannot retrieve volume key for plain device.\n"
 msgstr "Nelze získat klíč svazku pro otevřené zařízení.\n"
 
-#: lib/setup.c:2122
+#: lib/setup.c:2080
 #, c-format
 msgid "This operation is not supported for %s crypt device.\n"
 msgstr "Na šifrovaném zařízení %s není tato operace podporována.\n"
 
-#: lib/setup.c:2317
+#: lib/setup.c:2275
 msgid "Dump operation is not supported for this device type.\n"
 msgstr "Operace výpisu není na zařízení tohoto typu podporována.\n"
 
-#: lib/utils.c:275
-#, c-format
-msgid "Device %s doesn't exist or access denied.\n"
-msgstr "Zařízení %s neexistuje nebo přístup byl zamítnut.\n"
-
-#: lib/utils.c:285
-#, c-format
-msgid "Cannot open device %s for %s%s access.\n"
-msgstr "Zařízení %s nelze otevřít pro %s%s přístup.\n"
-
-#: lib/utils.c:286
-msgid "exclusive "
-msgstr "výlučný "
-
-#: lib/utils.c:287
-msgid "writable"
-msgstr "zápisový"
-
-#: lib/utils.c:287
-msgid "read-only"
-msgstr "jen pro čtení"
-
-#: lib/utils.c:294 src/cryptsetup_reencrypt.c:241
-#, c-format
-msgid "Cannot read device %s.\n"
-msgstr "Ze zařízení %s nelze číst.\n"
-
-#: lib/utils.c:391
-#, c-format
-msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
-msgstr ""
-"Zařízení %s nelze použít, protože se již používá\n"
-"(již namapováno nebo připojeno).\n"
-
-#: lib/utils.c:395
-#, c-format
-msgid "Cannot get info about device %s.\n"
-msgstr "O zařízení %s nelze získat údaje.\n"
-
-#: lib/utils.c:401
-#, c-format
-msgid "Requested offset is beyond real size of device %s.\n"
-msgstr "Požadovaná poloha je za hranicí skutečné velikosti zařízení %s.\n"
-
-#: lib/utils.c:409
-#, c-format
-msgid "Device %s has zero size.\n"
-msgstr "Zařízení %s má nulovou velikost.\n"
-
-#: lib/utils.c:420 lib/luks1/keymanage.c:85
-#, c-format
-msgid "Device %s is too small.\n"
-msgstr "Zařízení %s je příliš malé.\n"
-
-#: lib/utils.c:444
-msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
-msgstr "POZOR!!! Zřejmě nezabezpečená paměť. Jste root?\n"
-
-#: lib/utils.c:450
+#: lib/utils.c:238
 msgid "Cannot get process priority.\n"
 msgstr "Nelze zjistit prioritu procesu.\n"
 
-#: lib/utils.c:453 lib/utils.c:466
+#: lib/utils.c:241 lib/utils.c:254
 #, c-format
 msgid "setpriority %d failed: %s\n"
 msgstr "nastavení priority %d selhalo: %s\n"
 
-#: lib/utils.c:464
+#: lib/utils.c:252
 msgid "Cannot unlock memory.\n"
 msgstr "Paměť nelze odemknout.\n"
 
-#: lib/utils_crypt.c:221 lib/utils_crypt.c:234 lib/utils_crypt.c:338
-#: lib/utils_crypt.c:354
+#: lib/utils_crypt.c:225 lib/utils_crypt.c:238 lib/utils_crypt.c:385
+#: lib/utils_crypt.c:400
 msgid "Out of memory while reading passphrase.\n"
 msgstr "Při čtení hesla došla paměť.\n"
 
-#: lib/utils_crypt.c:226 lib/utils_crypt.c:241
+#: lib/utils_crypt.c:230 lib/utils_crypt.c:245
 msgid "Error reading passphrase from terminal.\n"
 msgstr "Chyba při čtení hesla z terminálu.\n"
 
-#: lib/utils_crypt.c:239
+#: lib/utils_crypt.c:243
 msgid "Verify passphrase: "
 msgstr "Ověřte heslo: "
 
-#: lib/utils_crypt.c:246
+#: lib/utils_crypt.c:250
 msgid "Passphrases do not match.\n"
 msgstr "Hesla se neshodují.\n"
 
-#: lib/utils_crypt.c:287
+#: lib/utils_crypt.c:334
 msgid "Cannot use offset with terminal input.\n"
 msgstr "Ve vstupu z terminálu nelze měnit polohu.\n"
 
-#: lib/utils_crypt.c:306
+#: lib/utils_crypt.c:353
 msgid "Failed to open key file.\n"
 msgstr "Soubor s klíčem se nepodařilo otevřít.\n"
 
-#: lib/utils_crypt.c:315
+#: lib/utils_crypt.c:362
 msgid "Failed to stat key file.\n"
 msgstr "O souboru s klíčem nebylo možné zjistit údaje.\n"
 
-#: lib/utils_crypt.c:323 lib/utils_crypt.c:345
+#: lib/utils_crypt.c:370 lib/utils_crypt.c:391
 msgid "Cannot seek to requested keyfile offset.\n"
 msgstr "Nelze se přesunout na požadované místo v souboru s klíčem.\n"
 
-#: lib/utils_crypt.c:362
+#: lib/utils_crypt.c:408
 msgid "Error reading passphrase.\n"
 msgstr "Chyba při čtení hesla.\n"
 
-#: lib/utils_crypt.c:380
+#: lib/utils_crypt.c:426
 msgid "Maximum keyfile size exceeded.\n"
 msgstr "Maximální délka souboru s klíčem překročena.\n"
 
-#: lib/utils_crypt.c:385
+#: lib/utils_crypt.c:431
 msgid "Cannot read requested amount of data.\n"
 msgstr "Požadované množství dat nelze načíst.\n"
 
@@ -393,20 +334,75 @@ msgstr "Ověření kontrolního součtu FIPS selhalo.\n"
 msgid "Running in FIPS mode.\n"
 msgstr "Režim FIPS zapnut.\n"
 
-#: lib/luks1/keyencryption.c:82
+#: lib/utils_device.c:48
+#, c-format
+msgid "Device %s doesn't exist or access denied.\n"
+msgstr "Zařízení %s neexistuje nebo přístup byl zamítnut.\n"
+
+#: lib/utils_device.c:58 lib/luks1/keymanage.c:298 lib/luks1/keymanage.c:527
+#: lib/luks1/keymanage.c:567 lib/verity/verity.c:80 lib/verity/verity.c:174
+#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:304
+#: lib/verity/verity_hash.c:324
+#, c-format
+msgid "Cannot open device %s.\n"
+msgstr "Zařízení %s nelze otevřít.\n"
+
+#: lib/utils_device.c:333
+msgid "Cannot use a loopback device, running as non-root user.\n"
+msgstr "Zařízení typu loopback nelze použít, nespuštěno superuživatelem.\n"
+
+#: lib/utils_device.c:336
+msgid "Cannot find a free loopback device.\n"
+msgstr "Nelze najít volné zařízení zpětné smyčky.\n"
+
+#: lib/utils_device.c:343
+msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
+msgstr ""
+"Připojení zařízení zpětné smyčky selhalo (požadováno zařízení s příznakem\n"
+"autoclear).\n"
+
+#: lib/utils_device.c:383
+#, c-format
+msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
+msgstr ""
+"Zařízení %s nelze použít, protože se již používá\n"
+"(již namapováno nebo připojeno).\n"
+
+#: lib/utils_device.c:387
+#, c-format
+msgid "Cannot get info about device %s.\n"
+msgstr "O zařízení %s nelze získat údaje.\n"
+
+#: lib/utils_device.c:393
+#, c-format
+msgid "Requested offset is beyond real size of device %s.\n"
+msgstr "Požadovaná poloha je za hranicí skutečné velikosti zařízení %s.\n"
+
+#: lib/utils_device.c:401
 #, c-format
-msgid "Unable to obtain sector size for %s"
-msgstr "Není možné zjistit velikost sektoru u %s"
+msgid "Device %s has zero size.\n"
+msgstr "Zařízení %s má nulovou velikost.\n"
+
+#: lib/utils_device.c:412 lib/luks1/keymanage.c:89
+#, c-format
+msgid "Device %s is too small.\n"
+msgstr "Zařízení %s je příliš malé.\n"
 
-#: lib/luks1/keyencryption.c:109
+#: lib/luks1/keyencryption.c:66 lib/luks1/keymanage.c:295
+#: lib/luks1/keymanage.c:564 lib/luks1/keymanage.c:981
+#, c-format
+msgid "Cannot write to device %s, permission denied.\n"
+msgstr "Na zařízení %s nelze zapsat, podovlení zamítnuto.\n"
+
+#: lib/luks1/keyencryption.c:91
 msgid "Key size in XTS mode must be 256 or 512 bits.\n"
 msgstr "V režimu XTS musí být velikost klíče 256 nebo 512 bitů.\n"
 
-#: lib/luks1/keyencryption.c:132
+#: lib/luks1/keyencryption.c:117
 msgid "Failed to obtain device mapper directory."
 msgstr "Adresář device-mapperu se nepodařilo získat."
 
-#: lib/luks1/keyencryption.c:148
+#: lib/luks1/keyencryption.c:133
 #, c-format
 msgid ""
 "Failed to setup dm-crypt key mapping for device %s.\n"
@@ -417,67 +413,67 @@ msgstr ""
 "Zkontrolujte, že jádro podporuje šifru %s (podrobnosti v syslogu).\n"
 "%s"
 
-#: lib/luks1/keyencryption.c:158
+#: lib/luks1/keyencryption.c:143
 msgid "Failed to open temporary keystore device.\n"
 msgstr "Otevření dočasného zařízení s úložištěm klíče selhalo.\n"
 
-#: lib/luks1/keyencryption.c:165
+#: lib/luks1/keyencryption.c:150
 msgid "Failed to access temporary keystore device.\n"
 msgstr "Přístup do dočasného zařízení s úložištěm klíče selhal.\n"
 
-#: lib/luks1/keymanage.c:157
+#: lib/luks1/keymanage.c:161
 #, c-format
 msgid "Requested file %s already exist.\n"
 msgstr "Požadovaný soubor %s již existuje.\n"
 
-#: lib/luks1/keymanage.c:177 lib/luks1/keymanage.c:408
-#: src/cryptsetup_reencrypt.c:1062
+#: lib/luks1/keymanage.c:181 lib/luks1/keymanage.c:417
+#: src/cryptsetup_reencrypt.c:1014
 #, c-format
 msgid "Device %s is not a valid LUKS device.\n"
 msgstr "Zařízení %s není platným zařízením LUKS.\n"
 
-#: lib/luks1/keymanage.c:197
+#: lib/luks1/keymanage.c:202
 #, c-format
 msgid "Cannot write header backup file %s.\n"
 msgstr "Nelze zapsat soubor %s se zálohou hlavičky.\n"
 
-#: lib/luks1/keymanage.c:224
+#: lib/luks1/keymanage.c:229
 #, c-format
 msgid "Backup file %s doesn't exist.\n"
 msgstr "Záložní soubor %s neexistuje.\n"
 
-#: lib/luks1/keymanage.c:233
+#: lib/luks1/keymanage.c:238
 msgid "Backup file doesn't contain valid LUKS header.\n"
 msgstr "Záložní soubor neobsahuje platnou hlavičku LUKS.\n"
 
-#: lib/luks1/keymanage.c:246
+#: lib/luks1/keymanage.c:251
 #, c-format
 msgid "Cannot open header backup file %s.\n"
 msgstr "Nelze otevřít soubor se zálohou hlavičky %s.\n"
 
-#: lib/luks1/keymanage.c:252
+#: lib/luks1/keymanage.c:257
 #, c-format
 msgid "Cannot read header backup file %s.\n"
 msgstr "Soubor se zálohou hlavičky %s nelze načíst.\n"
 
-#: lib/luks1/keymanage.c:263
+#: lib/luks1/keymanage.c:268
 msgid "Data offset or key size differs on device and backup, restore failed.\n"
 msgstr "Počátek dat nebo velikost klíče se liší mezi zařízením a zálohou, obnova se nezdařila.\n"
 
-#: lib/luks1/keymanage.c:271
+#: lib/luks1/keymanage.c:276
 #, c-format
 msgid "Device %s %s%s"
 msgstr "Zařízení %s %s%s"
 
-#: lib/luks1/keymanage.c:272
+#: lib/luks1/keymanage.c:277
 msgid "does not contain LUKS header. Replacing header can destroy data on that device."
 msgstr "neobsahuje hlavičku LUKS. Nahrazení hlavičky může zničit data na daném zařízení."
 
-#: lib/luks1/keymanage.c:273
+#: lib/luks1/keymanage.c:278
 msgid "already contains LUKS header. Replacing header will destroy existing keyslots."
 msgstr "již obsahuje hlavičku LUKS. Nahrazení hlavičky zničí existující pozice s klíči."
 
-#: lib/luks1/keymanage.c:274
+#: lib/luks1/keymanage.c:279
 msgid ""
 "\n"
 "WARNING: real device header has different UUID than backup!"
@@ -485,140 +481,124 @@ msgstr ""
 "\n"
 "POZOR: hlavička ve skutečném zařízení má jiné UUID než záloha!"
 
-#: lib/luks1/keymanage.c:289 lib/luks1/keymanage.c:513
-#: lib/luks1/keymanage.c:549 lib/verity/verity.c:79 lib/verity/verity.c:172
-#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:302
-#: lib/verity/verity_hash.c:321
-#, c-format
-msgid "Cannot open device %s.\n"
-msgstr "Zařízení %s nelze otevřít.\n"
-
-#: lib/luks1/keymanage.c:319
+#: lib/luks1/keymanage.c:328
 msgid "Non standard key size, manual repair required.\n"
 msgstr "Nestandardní velikost klíče, je třeba ruční opravy.\n"
 
-#: lib/luks1/keymanage.c:324
+#: lib/luks1/keymanage.c:333
 msgid "Non standard keyslots alignment, manual repair required.\n"
 msgstr "Nestandardní zarovnání pozice klíče, je třeba ruční opravy.\n"
 
-#: lib/luks1/keymanage.c:330
+#: lib/luks1/keymanage.c:339
 msgid "Repairing keyslots.\n"
 msgstr "Opravují se pozice klíčů.\n"
 
-#: lib/luks1/keymanage.c:341
+#: lib/luks1/keymanage.c:350
 msgid "Repair failed."
 msgstr "Oprava selhala."
 
-#: lib/luks1/keymanage.c:353
+#: lib/luks1/keymanage.c:362
 #, c-format
 msgid "Keyslot %i: offset repaired (%u -> %u).\n"
 msgstr "Pozice klíče %i: poloha opravena (%u → %u).\n"
 
-#: lib/luks1/keymanage.c:361
+#: lib/luks1/keymanage.c:370
 #, c-format
 msgid "Keyslot %i: stripes repaired (%u -> %u).\n"
 msgstr "Pozice klíče %i: proklad opraven (%u → %u).\n"
 
-#: lib/luks1/keymanage.c:370
+#: lib/luks1/keymanage.c:379
 #, c-format
 msgid "Keyslot %i: bogus partition signature.\n"
 msgstr "Pozice klíče %i: chybná značka oddílu.\n"
 
-#: lib/luks1/keymanage.c:375
+#: lib/luks1/keymanage.c:384
 #, c-format
 msgid "Keyslot %i: salt wiped.\n"
 msgstr "Pozice klíče %i: sůl vymazána.\n"
 
-#: lib/luks1/keymanage.c:386
+#: lib/luks1/keymanage.c:395
 msgid "Writing LUKS header to disk.\n"
 msgstr "Hlavička LUKS se zapisuje na disk.\n"
 
-#: lib/luks1/keymanage.c:411
+#: lib/luks1/keymanage.c:420
 #, c-format
 msgid "Unsupported LUKS version %d.\n"
 msgstr "Nepodporovaná verze LUKS %d.\n"
 
-#: lib/luks1/keymanage.c:417 lib/luks1/keymanage.c:621
+#: lib/luks1/keymanage.c:426 lib/luks1/keymanage.c:639
 #, c-format
 msgid "Requested LUKS hash %s is not supported.\n"
 msgstr "Požadovaný haš LUKSu %s není podporován.\n"
 
-#: lib/luks1/keymanage.c:432
+#: lib/luks1/keymanage.c:441
 #, c-format
 msgid "LUKS keyslot %u is invalid.\n"
 msgstr "Pozice %u klíče LUKS není platná.\n"
 
-#: lib/luks1/keymanage.c:446 src/cryptsetup.c:537
+#: lib/luks1/keymanage.c:455 src/cryptsetup.c:388
 msgid "No known problems detected for LUKS header.\n"
 msgstr "V hlavičce LUKS nenalezen žádný známý problém.\n"
 
-#: lib/luks1/keymanage.c:480
+#: lib/luks1/keymanage.c:488
 #, c-format
 msgid "Cannot open file %s.\n"
 msgstr "Soubor %s nelze otevřít.\n"
 
-#: lib/luks1/keymanage.c:570
+#: lib/luks1/keymanage.c:588
 #, c-format
 msgid "Error during update of LUKS header on device %s.\n"
 msgstr "Chyba při aktualizaci hlavičky LUKS na zařízení %s.\n"
 
-#: lib/luks1/keymanage.c:577
+#: lib/luks1/keymanage.c:595
 #, c-format
 msgid "Error re-reading LUKS header after update on device %s.\n"
 msgstr "Chyba při opakovaném čtení hlavičky LUKS po aktualizaci zařízení %s.\n"
 
-#: lib/luks1/keymanage.c:589
+#: lib/luks1/keymanage.c:608
 #, c-format
 msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n"
 msgstr "Neslučitelné volby PBKDF2 (při použití hašovacího algoritmu %s).\n"
 
-#: lib/luks1/keymanage.c:626 lib/luks1/keymanage.c:708
+#: lib/luks1/keymanage.c:644 lib/luks1/keymanage.c:726
 msgid "Wrong LUKS UUID format provided.\n"
 msgstr "Poskytnut UUID LUKSu ve špatném tvaru.\n"
 
-#: lib/luks1/keymanage.c:651
+#: lib/luks1/keymanage.c:669
 msgid "Cannot create LUKS header: reading random salt failed.\n"
 msgstr "Hlavičku LUKS nelze vytvořit: čtení náhodné soli selhalo.\n"
 
-#: lib/luks1/keymanage.c:668
+#: lib/luks1/keymanage.c:686
 #, c-format
 msgid "Cannot create LUKS header: header digest failed (using hash %s).\n"
 msgstr "Hlavičku LUKS nelze vytvořit: výpočet otisku hlavičky (haš %s) selhal.\n"
 
-#: lib/luks1/keymanage.c:733
+#: lib/luks1/keymanage.c:751
 #, c-format
 msgid "Key slot %d active, purge first.\n"
 msgstr "Pozice klíče %d je aktivní, nejprve ji uvolněte.\n"
 
-#: lib/luks1/keymanage.c:738
+#: lib/luks1/keymanage.c:757
 #, c-format
 msgid "Key slot %d material includes too few stripes. Header manipulation?\n"
 msgstr "Pozice klíče %d obsahuje příliš málo útržků. Manipulace s hlavičkou?\n"
 
-#: lib/luks1/keymanage.c:805
-msgid "Failed to write to key storage.\n"
-msgstr "Zápis do úložiště klíče selhal.\n"
-
-#: lib/luks1/keymanage.c:890
-msgid "Failed to read from key storage.\n"
-msgstr "Čtení z úložiště klíče selhalo.\n"
-
-#: lib/luks1/keymanage.c:900
+#: lib/luks1/keymanage.c:914
 #, c-format
 msgid "Key slot %d unlocked.\n"
 msgstr "Pozice klíče %d odemknuta.\n"
 
-#: lib/luks1/keymanage.c:936 src/cryptsetup.c:736 src/cryptsetup.c:920
-#: src/cryptsetup_reencrypt.c:966 src/cryptsetup_reencrypt.c:1000
+#: lib/luks1/keymanage.c:949 src/cryptsetup.c:587 src/cryptsetup.c:771
+#: src/cryptsetup_reencrypt.c:918 src/cryptsetup_reencrypt.c:952
 msgid "No key available with this passphrase.\n"
 msgstr "S tímto heslem není dostupný žádný klíč.\n"
 
-#: lib/luks1/keymanage.c:954
+#: lib/luks1/keymanage.c:967
 #, c-format
 msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n"
 msgstr "Pozice klíče %d není platná, prosím, vyberte pozici mezi 0 a %d.\n"
 
-#: lib/luks1/keymanage.c:968
+#: lib/luks1/keymanage.c:985
 #, c-format
 msgid "Cannot wipe device %s.\n"
 msgstr "Zařízení %s není možné smazat.\n"
@@ -635,42 +615,42 @@ msgstr "Prosím, použijte gpg --decrypt SOUBOR_S_KLÍČEM | cryptsetup --keyfil
 msgid "Incompatible loop-AES keyfile detected.\n"
 msgstr "Zjištěn nekompatibilní soubor s klíčem loop-AES.\n"
 
-#: lib/loopaes/loopaes.c:231
+#: lib/loopaes/loopaes.c:230
 msgid "Kernel doesn't support loop-AES compatible mapping.\n"
 msgstr "Jádro nepodporuje mapování kompatibilní s loop-AES.\n"
 
-#: lib/verity/verity.c:68 lib/verity/verity.c:166
+#: lib/verity/verity.c:69 lib/verity/verity.c:168
 msgid "Verity device doesn't use on-disk header.\n"
 msgstr "Zařízení VERITY nepoužívá hlavičku uvnitř disku.\n"
 
-#: lib/verity/verity.c:91
+#: lib/verity/verity.c:92
 #, c-format
 msgid "Device %s is not a valid VERITY device.\n"
 msgstr "Zařízení %s není platným zařízením VERITY.\n"
 
-#: lib/verity/verity.c:97
+#: lib/verity/verity.c:98
 #, c-format
 msgid "Unsupported VERITY version %d.\n"
 msgstr "Nepodporovaná verze VERITY %d.\n"
 
-#: lib/verity/verity.c:127
+#: lib/verity/verity.c:128
 msgid "VERITY header corrupted.\n"
 msgstr "Hlavička VERITY je poškozena.\n"
 
-#: lib/verity/verity.c:161
+#: lib/verity/verity.c:163
 msgid "Wrong VERITY UUID format provided.\n"
 msgstr "Poskytnut UUID VERITY ve špatném tvaru.\n"
 
-#: lib/verity/verity.c:189
+#: lib/verity/verity.c:191
 #, c-format
 msgid "Error during update of verity header on device %s.\n"
 msgstr "Chyba při aktualizaci hlavičky VERITY na zařízení %s.\n"
 
-#: lib/verity/verity.c:265
+#: lib/verity/verity.c:270
 msgid "Kernel doesn't support dm-verity mapping.\n"
 msgstr "Jádro nepodporuje mapování dm-verity.\n"
 
-#: lib/verity/verity.c:276
+#: lib/verity/verity.c:281
 msgid "Verity device detected corruption after activation.\n"
 msgstr "Po aktivaci zjistilo zařízení VERITY poškození.\n"
 
@@ -679,7 +659,7 @@ msgstr "Po aktivaci zjistilo zařízení VERITY poškození.\n"
 msgid "Spare area is not zeroed at position %<PRIu64>.\n"
 msgstr "Řídká oblast na pozici %<PRIu64> není vynulována.\n"
 
-#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:247
+#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:248
 #: lib/verity/verity_hash.c:278 lib/verity/verity_hash.c:285
 msgid "Device offset overflow.\n"
 msgstr "Pozice na zařízení přetekla.\n"
@@ -689,27 +669,27 @@ msgstr "Pozice na zařízení přetekla.\n"
 msgid "Verification failed at position %<PRIu64>.\n"
 msgstr "Ověření na pozici %<PRIu64> selhalo.\n"
 
-#: lib/verity/verity_hash.c:233
+#: lib/verity/verity_hash.c:234
 msgid "Invalid size parameters for verity device.\n"
 msgstr "Neplatné parametry velikosti pro zařízení VERITY.\n"
 
-#: lib/verity/verity_hash.c:265
+#: lib/verity/verity_hash.c:266
 msgid "Too many tree levels for verity volume.\n"
 msgstr "Příliš mnoho úrovní stromu ve svazku VERITY.\n"
 
-#: lib/verity/verity_hash.c:351
+#: lib/verity/verity_hash.c:355
 msgid "Verification of data area failed.\n"
 msgstr "Ověření datové oblasti selhalo.\n"
 
-#: lib/verity/verity_hash.c:356
+#: lib/verity/verity_hash.c:360
 msgid "Verification of root hash failed.\n"
 msgstr "Ověření kořenového haše selhalo.\n"
 
-#: lib/verity/verity_hash.c:362
+#: lib/verity/verity_hash.c:366
 msgid "Input/output error while creating hash area.\n"
 msgstr "Při vytváření oblasti haší došlo k chybě na vstupu/výstupu.\n"
 
-#: lib/verity/verity_hash.c:364
+#: lib/verity/verity_hash.c:368
 msgid "Creation of hash area failed.\n"
 msgstr "Oblast haší se nepodařilo vytvořit.\n"
 
@@ -718,221 +698,212 @@ msgstr "Oblast haší se nepodařilo vytvořit.\n"
 msgid "WARNING: Kernel cannot activate device if data block size exceeds page size (%u).\n"
 msgstr "POZOR: Jádro nemůže aktivovat zařízení, pokud velikost datového bloku přesahuje velikost stránky (%u).\n"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "<name> <device>"
 msgstr "<název> <zařízení>"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "create device"
 msgstr "vytvoří zařízení"
 
-#: src/cryptsetup.c:106 src/cryptsetup.c:107 src/cryptsetup.c:108
-#: src/cryptsetup.c:118 src/cryptsetup.c:125 src/veritysetup.c:385
-#: src/veritysetup.c:386
+#: src/cryptsetup.c:89 src/cryptsetup.c:90 src/cryptsetup.c:91
+#: src/cryptsetup.c:101 src/cryptsetup.c:108 src/veritysetup.c:311
+#: src/veritysetup.c:312
 msgid "<name>"
 msgstr "<název>"
 
-#: src/cryptsetup.c:106
+#: src/cryptsetup.c:89
 msgid "remove device"
 msgstr "odstraní zařízení"
 
-#: src/cryptsetup.c:107
+#: src/cryptsetup.c:90
 msgid "resize active device"
 msgstr "změní velikost aktivního zařízení"
 
-#: src/cryptsetup.c:108
+#: src/cryptsetup.c:91
 msgid "show device status"
 msgstr "zobrazí stav zařízení"
 
-#: src/cryptsetup.c:109 src/cryptsetup.c:116 src/cryptsetup.c:117
-#: src/cryptsetup.c:119 src/cryptsetup.c:120 src/cryptsetup.c:121
-#: src/cryptsetup.c:122 src/cryptsetup.c:123
+#: src/cryptsetup.c:92 src/cryptsetup.c:99 src/cryptsetup.c:100
+#: src/cryptsetup.c:102 src/cryptsetup.c:103 src/cryptsetup.c:104
+#: src/cryptsetup.c:105 src/cryptsetup.c:106
 msgid "<device>"
 msgstr "<zařízení>"
 
-#: src/cryptsetup.c:109
+#: src/cryptsetup.c:92
 msgid "try to repair on-disk metadata"
 msgstr "pokusí se opravit metadata uložená na disku"
 
-#: src/cryptsetup.c:110 src/cryptsetup.c:112
+#: src/cryptsetup.c:93 src/cryptsetup.c:95
 msgid "<device> [<new key file>]"
 msgstr "<zařízení> [<soubor_s_novým_klíčem>]"
 
-#: src/cryptsetup.c:110
+#: src/cryptsetup.c:93
 msgid "formats a LUKS device"
 msgstr "naformátuje zařízení LUKS"
 
-#: src/cryptsetup.c:111 src/cryptsetup.c:124
+#: src/cryptsetup.c:94 src/cryptsetup.c:107
 msgid "<device> <name> "
 msgstr "<zařízení> <název> "
 
-#: src/cryptsetup.c:111
+#: src/cryptsetup.c:94
 msgid "open LUKS device as mapping <name>"
 msgstr "otevře zařízení LUKS jako mapování <název>"
 
-#: src/cryptsetup.c:112
+#: src/cryptsetup.c:95
 msgid "add key to LUKS device"
 msgstr "do zařízení LUKS přidá klíč"
 
-#: src/cryptsetup.c:113 src/cryptsetup.c:114
+#: src/cryptsetup.c:96 src/cryptsetup.c:97
 msgid "<device> [<key file>]"
 msgstr "<zařízení> [<soubor_s_klíčem>]"
 
-#: src/cryptsetup.c:113
+#: src/cryptsetup.c:96
 msgid "removes supplied key or key file from LUKS device"
 msgstr "odstraní zadaný klíč nebo soubor s klíčem ze zařízení LUKS"
 
-#: src/cryptsetup.c:114
+#: src/cryptsetup.c:97
 msgid "changes supplied key or key file of LUKS device"
 msgstr "změní zadaný klíč nebo soubor s klíčem u zařízení LUKS"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "<device> <key slot>"
 msgstr "<zařízení> <pozice_klíče>"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "wipes key with number <key slot> from LUKS device"
 msgstr "smaže klíč s číslem <pozice_klíče> ze zařízení LUKS"
 
-#: src/cryptsetup.c:116
+#: src/cryptsetup.c:99
 msgid "print UUID of LUKS device"
 msgstr "zobrazí UUID zařízení LUKS"
 
-#: src/cryptsetup.c:117
+#: src/cryptsetup.c:100
 msgid "tests <device> for LUKS partition header"
 msgstr "otestuje <zařízení> na hlavičku oddílu LUKS"
 
-#: src/cryptsetup.c:118
+#: src/cryptsetup.c:101
 msgid "remove LUKS mapping"
 msgstr "odstraní mapování LUKS"
 
-#: src/cryptsetup.c:119
+#: src/cryptsetup.c:102
 msgid "dump LUKS partition information"
 msgstr "vypíše údaje o oddílu LUKS"
 
 # TODO: not consistent with previous line
-#: src/cryptsetup.c:120
+#: src/cryptsetup.c:103
 msgid "Suspend LUKS device and wipe key (all IOs are frozen)."
 msgstr "uspí zařízení LUKS a smaže klíč (všechny operace budou zmrazeny)"
 
 # TODO: not consistent with previous line
-#: src/cryptsetup.c:121
+#: src/cryptsetup.c:104
 msgid "Resume suspended LUKS device."
 msgstr "probudí uspané zařízení LUKS"
 
 # TODO: not consistent with previous line
-#: src/cryptsetup.c:122
+#: src/cryptsetup.c:105
 msgid "Backup LUKS device header and keyslots"
 msgstr "zálohuje hlavičku zařízení LUKS a jeho pozice s klíči"
 
 # TODO: not consistent with previous line
-#: src/cryptsetup.c:123
+#: src/cryptsetup.c:106
 msgid "Restore LUKS device header and keyslots"
 msgstr "obnoví hlavičku zařízení LUKS a jeho pozice s klíči"
 
-#: src/cryptsetup.c:124
+#: src/cryptsetup.c:107
 msgid "open loop-AES device as mapping <name>"
 msgstr "otevře zařízení loop-AES jako mapování <název>"
 
-#: src/cryptsetup.c:125
+#: src/cryptsetup.c:108
 msgid "remove loop-AES mapping"
 msgstr "odstraní mapování loop-AES"
 
-#: src/cryptsetup.c:218
+#: src/cryptsetup.c:123
 msgid "Can't do passphrase verification on non-tty inputs.\n"
 msgstr "Se vstupem mimo terminál nelze ověřit heslo.\n"
 
-#: src/cryptsetup.c:233 src/veritysetup.c:432
-msgid "Command successful.\n"
-msgstr "Příkaz úspěšně vykonán.\n"
-
-#: src/cryptsetup.c:247 src/veritysetup.c:446
-#, c-format
-msgid "Command failed with code %i"
-msgstr "Příkaz selhal s kódem %i"
-
-#: src/cryptsetup.c:375
+#: src/cryptsetup.c:226
 msgid "Option --key-file is required.\n"
 msgstr "Je vyžadován přepínač --key-file.\n"
 
-#: src/cryptsetup.c:541
+#: src/cryptsetup.c:392
 msgid "Really try to repair LUKS device header?"
 msgstr "Opravdu se pokusit opravit hlavičku zařízení LUKS?"
 
-#: src/cryptsetup.c:566
+#: src/cryptsetup.c:417
 #, c-format
 msgid "This will overwrite data on %s irrevocably."
 msgstr "Toto nevratně přepíše data na %s."
 
-#: src/cryptsetup.c:568
+#: src/cryptsetup.c:419
 msgid "memory allocation error in action_luksFormat"
 msgstr "chyba alokace paměti v action_luksFormat"
 
-#: src/cryptsetup.c:580 src/cryptsetup_reencrypt.c:576
-#: src/cryptsetup_reencrypt.c:611
+#: src/cryptsetup.c:431 src/cryptsetup_reencrypt.c:522
+#: src/cryptsetup_reencrypt.c:557
 msgid "No known cipher specification pattern detected.\n"
 msgstr "Nelze určit žádnou známou specifikaci šifry.\n"
 
-#: src/cryptsetup.c:586
+#: src/cryptsetup.c:437
 #, c-format
 msgid "Cannot use %s as on-disk header.\n"
 msgstr "%s nelze použít pro hlavičku uvnitř disku.\n"
 
-#: src/cryptsetup.c:601 src/cryptsetup.c:1034
+#: src/cryptsetup.c:452 src/cryptsetup.c:885
 msgid "Enter LUKS passphrase: "
 msgstr "Zadejte heslo LUKS: "
 
-#: src/cryptsetup.c:658
+#: src/cryptsetup.c:509
 msgid "Reduced data offset is allowed only for detached LUKS header.\n"
 msgstr "Zmenšená poloha dat je dovolena jen u oddělené hlavičky LUKS.\n"
 
-#: src/cryptsetup.c:759 src/cryptsetup.c:814
+#: src/cryptsetup.c:610 src/cryptsetup.c:665
 #, c-format
 msgid "Key slot %d selected for deletion.\n"
 msgstr "Ke smazání vybrán klíč na pozici %d.\n"
 
-#: src/cryptsetup.c:762
+#: src/cryptsetup.c:613
 #, c-format
 msgid "Key %d not active. Can't wipe.\n"
 msgstr "Klíč %d není aktivní. Nelze jej odstranit.\n"
 
-#: src/cryptsetup.c:770 src/cryptsetup.c:817
+#: src/cryptsetup.c:621 src/cryptsetup.c:668
 msgid "This is the last keyslot. Device will become unusable after purging this key."
 msgstr ""
 "Toto je poslední pozice klíče. Smazáním tohoto klíče přijdete o možnost\n"
 "zařízení použít."
 
-#: src/cryptsetup.c:771
+#: src/cryptsetup.c:622
 msgid "Enter any remaining LUKS passphrase: "
 msgstr "Zadejte jakékoliv jiné heslo LUKS: "
 
-#: src/cryptsetup.c:799
+#: src/cryptsetup.c:650
 msgid "Enter LUKS passphrase to be deleted: "
 msgstr "Zadejte heslo LUKS, které se má smazat: "
 
-#: src/cryptsetup.c:902
+#: src/cryptsetup.c:753
 msgid "Enter LUKS passphrase to be changed: "
 msgstr "Zadejte heslo LUKS, které má být změněno: "
 
-#: src/cryptsetup.c:939 src/cryptsetup_reencrypt.c:1018
+#: src/cryptsetup.c:790 src/cryptsetup_reencrypt.c:970
 msgid "Enter new LUKS passphrase: "
 msgstr "Zadejte nové heslo LUKS: "
 
-#: src/cryptsetup.c:953
+#: src/cryptsetup.c:804
 #, c-format
 msgid "Key slot %d changed.\n"
 msgstr "Pozice klíče %d změněna.\n"
 
-#: src/cryptsetup.c:959
+#: src/cryptsetup.c:810
 #, c-format
 msgid "Replaced with key slot %d.\n"
 msgstr "Nahrazeno pozicí klíče %d.\n"
 
-#: src/cryptsetup.c:964
+#: src/cryptsetup.c:815
 msgid "Failed to swap new key slot.\n"
 msgstr "Záměna novou pozicí klíče se nezdařila.\n"
 
-#: src/cryptsetup.c:1023
+#: src/cryptsetup.c:874
 msgid ""
 "LUKS header dump with volume key is sensitive information\n"
 "which allows access to encrypted partition without passphrase.\n"
@@ -942,11 +913,11 @@ msgstr ""
 "který umožňuje přístup k šifrovanému oddílu bez znalosti hesla.\n"
 "Tento výpis by měl být vždy uložen na bezpečném místě a v zašifrované podobě."
 
-#: src/cryptsetup.c:1128 src/cryptsetup.c:1149
+#: src/cryptsetup.c:979 src/cryptsetup.c:1000
 msgid "Option --header-backup-file is required.\n"
 msgstr "Je vyžadován přepínač --header-backup-file.\n"
 
-#: src/cryptsetup.c:1187 src/veritysetup.c:402
+#: src/cryptsetup.c:1027 src/veritysetup.c:328
 msgid ""
 "\n"
 "<action> is one of:\n"
@@ -954,7 +925,7 @@ msgstr ""
 "\n"
 "<akce> je jedna z:\n"
 
-#: src/cryptsetup.c:1193
+#: src/cryptsetup.c:1033
 #, c-format
 msgid ""
 "\n"
@@ -969,7 +940,7 @@ msgstr ""
 "<pozice_klíče> je číslo pozice klíče LUKS, který se má upravit\n"
 "<soubor_s_klíčem> je volitelný soubor s novým klíčem pro akci luksAddKey\n"
 
-#: src/cryptsetup.c:1200
+#: src/cryptsetup.c:1040
 #, c-format
 msgid ""
 "\n"
@@ -980,7 +951,7 @@ msgstr ""
 "Výchozí zakompilované parametry souborů s klíči:\n"
 "\tMaximální velikost souboru s klíčem: %d kB, Maximální délka interaktivního hesla %d (znaků)\n"
 
-#: src/cryptsetup.c:1205
+#: src/cryptsetup.c:1045
 #, c-format
 msgid ""
 "\n"
@@ -995,199 +966,200 @@ msgstr ""
 "\tplain: %s, Klíč: %d bitů, Haš hesla: %s\n"
 "\tLUKS1: %s, Klíč: %d bitů, Haš hlavičky LUKS: %s, RNG: %s\n"
 
-#: src/cryptsetup.c:1273 src/veritysetup.c:486 src/cryptsetup_reencrypt.c:1207
+#: src/cryptsetup.c:1085 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1135
 msgid "Show this help message"
 msgstr "Zobrazí tuto nápovědu"
 
-#: src/cryptsetup.c:1274 src/veritysetup.c:487 src/cryptsetup_reencrypt.c:1208
+#: src/cryptsetup.c:1086 src/veritysetup.c:369 src/cryptsetup_reencrypt.c:1136
 msgid "Display brief usage"
 msgstr "Zobrazí stručný návod na použití"
 
-#: src/cryptsetup.c:1278 src/veritysetup.c:491 src/cryptsetup_reencrypt.c:1212
+#: src/cryptsetup.c:1090 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1140
 msgid "Help options:"
 msgstr "Přepínače nápovědy:"
 
-#: src/cryptsetup.c:1279 src/veritysetup.c:492 src/cryptsetup_reencrypt.c:1213
+#: src/cryptsetup.c:1091 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1141
 msgid "Print package version"
 msgstr "Vypíše verzi balíku"
 
-#: src/cryptsetup.c:1280 src/veritysetup.c:493 src/cryptsetup_reencrypt.c:1214
+#: src/cryptsetup.c:1092 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1142
 msgid "Shows more detailed error messages"
 msgstr "Zobrazuje podrobnější chybové hlášky"
 
-#: src/cryptsetup.c:1281 src/veritysetup.c:494 src/cryptsetup_reencrypt.c:1215
+#: src/cryptsetup.c:1093 src/veritysetup.c:376 src/cryptsetup_reencrypt.c:1143
 msgid "Show debug messages"
 msgstr "Zobrazuje ladicí hlášky"
 
-#: src/cryptsetup.c:1282 src/cryptsetup_reencrypt.c:1217
+#: src/cryptsetup.c:1094 src/cryptsetup_reencrypt.c:1145
 msgid "The cipher used to encrypt the disk (see /proc/crypto)"
 msgstr "Šifra použita k zašifrování disku (vizte /proc/crypto)"
 
-#: src/cryptsetup.c:1283 src/cryptsetup_reencrypt.c:1219
+#: src/cryptsetup.c:1095 src/cryptsetup_reencrypt.c:1147
 msgid "The hash used to create the encryption key from the passphrase"
 msgstr "Haš použit k vytvoření šifrovacího klíče z hesla"
 
-#: src/cryptsetup.c:1284
+#: src/cryptsetup.c:1096
 msgid "Verifies the passphrase by asking for it twice"
 msgstr "Ověřuje heslo dvojitým dotazem"
 
 # TODO: Remove period
-#: src/cryptsetup.c:1285 src/cryptsetup_reencrypt.c:1220
+#: src/cryptsetup.c:1097 src/cryptsetup_reencrypt.c:1148
 msgid "Read the key from a file."
 msgstr "Klíč načte ze souboru"
 
 # TODO: Remove period
-#: src/cryptsetup.c:1286
+#: src/cryptsetup.c:1098
 msgid "Read the volume (master) key from file."
 msgstr "(Hlavní) klíč svazku načte ze souboru"
 
 # TODO: Remove period
-#: src/cryptsetup.c:1287
+#: src/cryptsetup.c:1099
 msgid "Dump volume (master) key instead of keyslots info."
 msgstr "Vypíše (hlavní) klíč svazku namísto údajů o pozicích klíčů"
 
-#: src/cryptsetup.c:1288 src/cryptsetup_reencrypt.c:1218
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "The size of the encryption key"
 msgstr "Velikost šifrovacího klíče"
 
-#: src/cryptsetup.c:1288 src/cryptsetup_reencrypt.c:1218
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "BITS"
 msgstr "BITY"
 
-#: src/cryptsetup.c:1289 src/cryptsetup_reencrypt.c:1231
+#: src/cryptsetup.c:1101 src/cryptsetup_reencrypt.c:1159
 msgid "Limits the read from keyfile"
 msgstr "Omezí čtení ze souboru s klíčem"
 
-#: src/cryptsetup.c:1289 src/cryptsetup.c:1290 src/cryptsetup.c:1291
-#: src/cryptsetup.c:1292 src/veritysetup.c:497 src/veritysetup.c:498
-#: src/veritysetup.c:500 src/cryptsetup_reencrypt.c:1230
-#: src/cryptsetup_reencrypt.c:1231
+#: src/cryptsetup.c:1101 src/cryptsetup.c:1102 src/cryptsetup.c:1103
+#: src/cryptsetup.c:1104 src/veritysetup.c:379 src/veritysetup.c:380
+#: src/veritysetup.c:382 src/cryptsetup_reencrypt.c:1158
+#: src/cryptsetup_reencrypt.c:1159 src/cryptsetup_reencrypt.c:1160
+#: src/cryptsetup_reencrypt.c:1161
 msgid "bytes"
 msgstr "bajty"
 
-#: src/cryptsetup.c:1290 src/cryptsetup_reencrypt.c:1230
+#: src/cryptsetup.c:1102 src/cryptsetup_reencrypt.c:1158
 msgid "Number of bytes to skip in keyfile"
 msgstr "Přeskočí daný počet bajtů na začátku souboru s klíčem"
 
-#: src/cryptsetup.c:1291
+#: src/cryptsetup.c:1103
 msgid "Limits the read from newly added keyfile"
 msgstr "Omezí čtení z nově přidaného souboru s klíčem"
 
-#: src/cryptsetup.c:1292
+#: src/cryptsetup.c:1104
 msgid "Number of bytes to skip in newly added keyfile"
 msgstr "Přeskočí daný počet bajtů na začátku nově přidaného souboru s klíčem"
 
-#: src/cryptsetup.c:1293
+#: src/cryptsetup.c:1105
 msgid "Slot number for new key (default is first free)"
 msgstr "Číslo pozice pro nový klíč (výchozí je první volná)"
 
-#: src/cryptsetup.c:1294
+#: src/cryptsetup.c:1106
 msgid "The size of the device"
 msgstr "Velikost zařízení"
 
-#: src/cryptsetup.c:1294 src/cryptsetup.c:1295 src/cryptsetup.c:1296
-#: src/cryptsetup.c:1302 src/cryptsetup_reencrypt.c:1232
+#: src/cryptsetup.c:1106 src/cryptsetup.c:1107 src/cryptsetup.c:1108
+#: src/cryptsetup.c:1114
 msgid "SECTORS"
 msgstr "SEKTORY"
 
-#: src/cryptsetup.c:1295
+#: src/cryptsetup.c:1107
 msgid "The start offset in the backend device"
 msgstr "Poloha začátku dat v podkladovém zařízení"
 
-#: src/cryptsetup.c:1296
+#: src/cryptsetup.c:1108
 msgid "How many sectors of the encrypted data to skip at the beginning"
 msgstr "Kolik sektorů šifrovaných dat se má na začátku přeskočit"
 
-#: src/cryptsetup.c:1297
+#: src/cryptsetup.c:1109
 msgid "Create a readonly mapping"
 msgstr "Vytvoří mapování určené jen pro čtení"
 
-#: src/cryptsetup.c:1298 src/cryptsetup_reencrypt.c:1221
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "PBKDF2 iteration time for LUKS (in ms)"
 msgstr "Doba opakování PBKDF2 pro LUKS (v ms)"
 
-#: src/cryptsetup.c:1298 src/cryptsetup_reencrypt.c:1221
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "msecs"
 msgstr "milisekundy"
 
-#: src/cryptsetup.c:1299 src/cryptsetup_reencrypt.c:1222
+#: src/cryptsetup.c:1111 src/cryptsetup_reencrypt.c:1150
 msgid "Do not ask for confirmation"
 msgstr "Nevyžaduje potvrzení"
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1112
 msgid "Timeout for interactive passphrase prompt (in seconds)"
 msgstr "Časový limit pro interaktivní dotaz na heslo (v sekundách)"
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1112
 msgid "secs"
 msgstr "sekundy"
 
-#: src/cryptsetup.c:1301 src/cryptsetup_reencrypt.c:1223
+#: src/cryptsetup.c:1113 src/cryptsetup_reencrypt.c:1151
 msgid "How often the input of the passphrase can be retried"
 msgstr "Kolikrát se lze zeptat na heslo"
 
-#: src/cryptsetup.c:1302
+#: src/cryptsetup.c:1114
 msgid "Align payload at <n> sector boundaries - for luksFormat"
 msgstr "Zarovnává data na hranici <n> sektorů – pro luksFormat"
 
-#: src/cryptsetup.c:1303
+#: src/cryptsetup.c:1115
 msgid "File with LUKS header and keyslots backup."
 msgstr "Soubor se zálohou hlavičky LUKS a jejích pozic s klíči"
 
-#: src/cryptsetup.c:1304 src/cryptsetup_reencrypt.c:1224
+#: src/cryptsetup.c:1116 src/cryptsetup_reencrypt.c:1152
 msgid "Use /dev/random for generating volume key."
 msgstr "Klíče svazku vytvoří z /dev/random."
 
-#: src/cryptsetup.c:1305 src/cryptsetup_reencrypt.c:1225
+#: src/cryptsetup.c:1117 src/cryptsetup_reencrypt.c:1153
 msgid "Use /dev/urandom for generating volume key."
 msgstr "Klíč svazku vytvoří z /dev/urandom."
 
-#: src/cryptsetup.c:1306
+#: src/cryptsetup.c:1118
 msgid "Share device with another non-overlapping crypt segment."
 msgstr "Zařízení sdílí s jiným nepřekrývajícím se šifrovaným segmentem."
 
-#: src/cryptsetup.c:1307 src/veritysetup.c:503
+#: src/cryptsetup.c:1119 src/veritysetup.c:385
 msgid "UUID for device to use."
 msgstr "Použije zařízení s UUID."
 
-#: src/cryptsetup.c:1308
+#: src/cryptsetup.c:1120
 msgid "Allow discards (aka TRIM) requests for device."
 msgstr "Povolí u daného zařízení požadavky na zahození (TRIM)."
 
-#: src/cryptsetup.c:1309
+#: src/cryptsetup.c:1121
 msgid "Device or file with separated LUKS header."
 msgstr "Zařízení nebo soubor s oddělenou hlavičkou LUKS."
 
-#: src/cryptsetup.c:1310
+#: src/cryptsetup.c:1122
 msgid "Do not activate device, just check passphrase."
 msgstr "Zařízení neaktivuje, jen zkontroluje heslo."
 
-#: src/cryptsetup.c:1329 src/veritysetup.c:520
+#: src/cryptsetup.c:1140 src/veritysetup.c:402
 msgid "[OPTION...] <action> <action-specific>"
 msgstr "[PŘEPÍNAČ…] <akce> <přepínače_akce>"
 
-#: src/cryptsetup.c:1369 src/veritysetup.c:557
+#: src/cryptsetup.c:1180 src/veritysetup.c:439
 msgid "Argument <action> missing."
 msgstr "Chybí argument <akce>."
 
-#: src/cryptsetup.c:1375 src/veritysetup.c:563
+#: src/cryptsetup.c:1186 src/veritysetup.c:445
 msgid "Unknown action."
 msgstr "Neznámá akce."
 
-#: src/cryptsetup.c:1390 src/veritysetup.c:578
+#: src/cryptsetup.c:1201 src/veritysetup.c:460
 #, c-format
 msgid "%s: requires %s as arguments"
 msgstr "%s: vyžaduje %s jako argumenty"
 
-#: src/cryptsetup.c:1399
+#: src/cryptsetup.c:1210
 msgid "Option --shared is allowed only for create operation.\n"
 msgstr "Přepínač --shared je dovolen jen při úkonu create.\n"
 
-#: src/cryptsetup.c:1407
+#: src/cryptsetup.c:1218
 msgid "Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"
 msgstr "Přepínač --allow-discards je dovolen jen při úkonech luksOpen, loopaesOpen a create.\n"
 
-#: src/cryptsetup.c:1415
+#: src/cryptsetup.c:1226
 msgid ""
 "Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n"
 "To limit read from keyfile use --keyfile-size=(bytes)."
@@ -1195,100 +1167,105 @@ msgstr ""
 "Přepínač --key-size je dovolen jen u luksFormat, create a  loopaesOpen.\n"
 "Čtení ze souboru s klíčem lze omezit pomocí --keyfile-size=(bajty)."
 
-#: src/cryptsetup.c:1422
+#: src/cryptsetup.c:1233
 msgid "Option --test-passphrase is allowed only for luksOpen.\n"
 msgstr "Přepínač --test-passphrase je dovolen pouze u luksOpen.\n"
 
-#: src/cryptsetup.c:1427 src/cryptsetup_reencrypt.c:1298
+#: src/cryptsetup.c:1238 src/cryptsetup_reencrypt.c:1221
 msgid "Key size must be a multiple of 8 bits"
 msgstr "Velikost klíče musí být násobkem 8 bitů."
 
-#: src/cryptsetup.c:1434 src/cryptsetup_reencrypt.c:1303
+#: src/cryptsetup.c:1245 src/cryptsetup_reencrypt.c:1226
 msgid "Key slot is invalid."
 msgstr "Pozice klíče není platná."
 
-#: src/cryptsetup.c:1441
+#: src/cryptsetup.c:1252
 msgid "Option --key-file takes precedence over specified key file argument.\n"
 msgstr "Přepínač --key-file má přednost před zadaným argumentem souboru s klíčem.\n"
 
-#: src/cryptsetup.c:1449 src/veritysetup.c:585 src/cryptsetup_reencrypt.c:1282
+#: src/cryptsetup.c:1260 src/veritysetup.c:467 src/cryptsetup_reencrypt.c:1210
 msgid "Negative number for option not permitted."
 msgstr "U přepínače není záporné číslo dovoleno."
 
-#: src/cryptsetup.c:1453 src/cryptsetup_reencrypt.c:1275
-#: src/cryptsetup_reencrypt.c:1307
+#: src/cryptsetup.c:1264 src/cryptsetup_reencrypt.c:1204
+#: src/cryptsetup_reencrypt.c:1230
 msgid "Only one of --use-[u]random options is allowed."
 msgstr "Je dovolen pouze jeden z přepínačů --use-[u]random."
 
-#: src/cryptsetup.c:1457
+#: src/cryptsetup.c:1268
 msgid "Option --use-[u]random is allowed only for luksFormat."
 msgstr "Přepínač --use-[u]random je dovolen pouze u luksFormat."
 
-#: src/cryptsetup.c:1461
+#: src/cryptsetup.c:1272
 msgid "Option --uuid is allowed only for luksFormat and luksUUID."
 msgstr "Přepínač --uuid je dovolen pouze u luksFormat a luksUUID."
 
-#: src/cryptsetup.c:1465
+#: src/cryptsetup.c:1276
 msgid "Option --align-payload is allowed only for luksFormat."
 msgstr "Přepínač --align-payload je dovolen pouze u luksFormat."
 
-#: src/cryptsetup.c:1470
+#: src/cryptsetup.c:1281
 msgid "Option --skip is supported only for create and loopaesOpen commands.\n"
 msgstr "Přepínač --skip je podporován jen u příkazů create a loopaesOpen.\n"
 
-#: src/cryptsetup.c:1475
+#: src/cryptsetup.c:1286
 msgid "Option --offset is supported only for create and loopaesOpen commands.\n"
 msgstr "Přepínač --offset je podporován jen u příkazů create a loopaesOpen.\n"
 
-#: src/veritysetup.c:118
+#: src/veritysetup.c:56
 msgid "Invalid salt string specified.\n"
 msgstr "Zadán neplatný řetězec se solí.\n"
 
-#: src/veritysetup.c:198
+#: src/veritysetup.c:89
+#, c-format
+msgid "Cannot create hash image %s for writing.\n"
+msgstr "Nelze vytvořit obraz hašů %s určený k zápisu.\n"
+
+#: src/veritysetup.c:148
 msgid "Invalid root hash string specified.\n"
 msgstr "Zadán neplatný řetězec s kořenovým hašem.\n"
 
-#: src/veritysetup.c:382
+#: src/veritysetup.c:308
 msgid "<data_device> <hash_device>"
 msgstr "<zařízení_dat> <zařízení_hašů>"
 
-#: src/veritysetup.c:382
+#: src/veritysetup.c:308
 msgid "format device"
 msgstr "naformátuje zařízení"
 
-#: src/veritysetup.c:383
+#: src/veritysetup.c:309
 msgid "<data_device> <hash_device> <root_hash>"
 msgstr "<zařízení_dat> <zařízení_hašů> <kořenový_haš>"
 
-#: src/veritysetup.c:383
+#: src/veritysetup.c:309
 msgid "verify device"
 msgstr "ověří zařízení"
 
-#: src/veritysetup.c:384
+#: src/veritysetup.c:310
 msgid "<name> <data_device> <hash_device> <root_hash>"
 msgstr "<název> <zařízení_dat> <zařízení_hašů> <kořenový_haš>"
 
-#: src/veritysetup.c:384
+#: src/veritysetup.c:310
 msgid "create active device"
 msgstr "vytvoří aktivní zařízení"
 
-#: src/veritysetup.c:385
+#: src/veritysetup.c:311
 msgid "remove (deactivate) device"
 msgstr "odstraní (deaktivuje) zařízení"
 
-#: src/veritysetup.c:386
+#: src/veritysetup.c:312
 msgid "show active device status"
 msgstr "zobrazí stav aktivního zařízení"
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:313
 msgid "<hash_device>"
 msgstr "<zařízení_hašů>"
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:313
 msgid "show on-disk information"
 msgstr "zobrazí údaje z disku"
 
-#: src/veritysetup.c:406
+#: src/veritysetup.c:332
 #, c-format
 msgid ""
 "\n"
@@ -1303,7 +1280,7 @@ msgstr ""
 "<zařízení_hašů> je zařízení obsahující ověřovací data\n"
 "<kořenový_haš> haš kořenového uzlu na <zařízení_hašů>\n"
 
-#: src/veritysetup.c:413
+#: src/veritysetup.c:339
 #, c-format
 msgid ""
 "\n"
@@ -1314,244 +1291,292 @@ msgstr ""
 "Výchozí zakompilované parametry dm-verity:\n"
 "\tHaš: %s, Datový blok (bajty): %u, Blok hašů (bajty): %u, Velikost soli: %u, Formát haše: %u\n"
 
-#: src/veritysetup.c:495
+#: src/veritysetup.c:377
 msgid "Do not use verity superblock"
 msgstr "Nepoužije superblok verity"
 
-#: src/veritysetup.c:496
+#: src/veritysetup.c:378
 msgid "Format type (1 - normal, 0 - original Chrome OS)"
 msgstr "Druh formátu (1 – běžný, 0 – původní z OS Chrome)"
 
-#: src/veritysetup.c:496
+#: src/veritysetup.c:378
 msgid "number"
 msgstr "číslo"
 
-#: src/veritysetup.c:497
+#: src/veritysetup.c:379
 msgid "Block size on the data device"
 msgstr "Velikost bloku na zařízení dat"
 
-#: src/veritysetup.c:498
+#: src/veritysetup.c:380
 msgid "Block size on the hash device"
 msgstr "Velikost bloku na zařízení hašů"
 
-#: src/veritysetup.c:499
+#: src/veritysetup.c:381
 msgid "The number of blocks in the data file"
 msgstr "Počet bloků v datovém souboru"
 
-#: src/veritysetup.c:499
+#: src/veritysetup.c:381
 msgid "blocks"
 msgstr "bloky"
 
-#: src/veritysetup.c:500
+#: src/veritysetup.c:382
 msgid "Starting offset on the hash device"
 msgstr "Poloha začátku dat v zařízení hašů"
 
-#: src/veritysetup.c:501
+#: src/veritysetup.c:383
 msgid "Hash algorithm"
 msgstr "Hašovací algoritmus"
 
-#: src/veritysetup.c:501
+#: src/veritysetup.c:383
 msgid "string"
 msgstr "řetězec"
 
-#: src/veritysetup.c:502
+#: src/veritysetup.c:384
 msgid "Salt"
 msgstr "Sůl"
 
-#: src/veritysetup.c:502
+#: src/veritysetup.c:384
 msgid "hex string"
 msgstr "šestnáctkový řetězec"
 
-#: src/cryptsetup_reencrypt.c:220
+#: src/cryptsetup_reencrypt.c:164
 #, c-format
 msgid "Cannot exclusively open %s, device in use.\n"
 msgstr "Zařízení %s nelze výlučně otevřít. Zařízení se používá.\n"
 
-#: src/cryptsetup_reencrypt.c:224
+#: src/cryptsetup_reencrypt.c:168
 #, c-format
 msgid "Cannot open device %s\n"
 msgstr "Zařízení %s nelze otevřít\n"
 
-#: src/cryptsetup_reencrypt.c:234 src/cryptsetup_reencrypt.c:460
-#: src/cryptsetup_reencrypt.c:870
+#: src/cryptsetup_reencrypt.c:178 src/cryptsetup_reencrypt.c:406
+#: src/cryptsetup_reencrypt.c:822
 msgid "Allocation of aligned memory failed.\n"
 msgstr "Alokace zarovnané paměti se nezdařila.\n"
 
-#: src/cryptsetup_reencrypt.c:252
+#: src/cryptsetup_reencrypt.c:185
+#, c-format
+msgid "Cannot read device %s.\n"
+msgstr "Ze zařízení %s nelze číst.\n"
+
+#: src/cryptsetup_reencrypt.c:196
 #, c-format
 msgid "Marking LUKS device %s unusable.\n"
 msgstr "LUKS zařízení %s se označuje za nepoužitelné.\n"
 
-#: src/cryptsetup_reencrypt.c:257
+#: src/cryptsetup_reencrypt.c:201
 #, c-format
 msgid "Marking LUKS device %s usable.\n"
 msgstr "LUKS zařízení %s se označuje za použitelné.\n"
 
-#: src/cryptsetup_reencrypt.c:273
+#: src/cryptsetup_reencrypt.c:217
 #, c-format
 msgid "Cannot write device %s.\n"
 msgstr "Zařízení %s není možné zapsat.\n"
 
-#: src/cryptsetup_reencrypt.c:352
+#: src/cryptsetup_reencrypt.c:298
 msgid "Cannot write reencryption log file.\n"
 msgstr "Nelze zapsat soubor s protokolem přešifrování.\n"
 
-#: src/cryptsetup_reencrypt.c:401
+#: src/cryptsetup_reencrypt.c:347
 msgid "Cannot read reencryption log file.\n"
 msgstr "Soubor s protokolem přešifrování nelze načíst.\n"
 
-# ???: Shouldn't it be `resuming reencryption'?
-#: src/cryptsetup_reencrypt.c:451
+#: src/cryptsetup_reencrypt.c:397
 #, c-format
-msgid "Log file %s exists, restarting reencryption.\n"
-msgstr "Soubor s protokolem %s existuje, přešifrování bude znovu zahájeno.\n"
+msgid "Log file %s exists, resuming reencryption.\n"
+msgstr "Soubor s protokolem %s existuje, pokračuje se v přerušeném přešifrování.\n"
 
-#: src/cryptsetup_reencrypt.c:505
+#: src/cryptsetup_reencrypt.c:451
 msgid "Activation of temporary devices failed.\n"
 msgstr "Aktivace dočasných zařízení selhala.\n"
 
-#: src/cryptsetup_reencrypt.c:530
+#: src/cryptsetup_reencrypt.c:476
 #, c-format
 msgid "New LUKS header for device %s created.\n"
 msgstr "Byla vytvořena nová hlavička LUKS zařízení %s.\n"
 
-#: src/cryptsetup_reencrypt.c:538
+#: src/cryptsetup_reencrypt.c:484
 #, c-format
 msgid "Activated keyslot %i.\n"
 msgstr "Pozice klíče %i aktivována.\n"
 
-#: src/cryptsetup_reencrypt.c:562
+#: src/cryptsetup_reencrypt.c:508
 #, c-format
 msgid "LUKS header backup of device %s created.\n"
 msgstr "Záloha hlavičky LUKS zařízení %s byla vytvořena.\n"
 
-#: src/cryptsetup_reencrypt.c:590
+#: src/cryptsetup_reencrypt.c:536
 msgid "Creation of LUKS backup headers failed.\n"
 msgstr "Záložní hlavičky LUKS se nepodařilo vytvořit.\n"
 
-#: src/cryptsetup_reencrypt.c:685
+#: src/cryptsetup_reencrypt.c:631
 #, c-format
 msgid "Cannot restore LUKS header on device %s.\n"
 msgstr "Hlavičku LUKS na zařízení %s nelze obnovit.\n"
 
-#: src/cryptsetup_reencrypt.c:687
+#: src/cryptsetup_reencrypt.c:633
 #, c-format
 msgid "LUKS header on device %s restored.\n"
 msgstr "Hlavička LUKS na zařízení %s byla obnovena.\n"
 
-#: src/cryptsetup_reencrypt.c:719
+#: src/cryptsetup_reencrypt.c:665
 #, c-format
 msgid "Progress: %5.1f%%, ETA %02llu:%02llu, %4llu MiB written, speed %5.1f MiB/s%s"
 msgstr "Průběh: %5.1f %%, ETA %02llu:%02llu, zapsáno %'4llu MiB, rychlost %'5.1f MiB/s%s"
 
-#: src/cryptsetup_reencrypt.c:735 src/cryptsetup_reencrypt.c:807
+#: src/cryptsetup_reencrypt.c:681 src/cryptsetup_reencrypt.c:757
 msgid "Cannot seek to device offset.\n"
 msgstr "Nelze se přesunout na požadované místo v zařízení.\n"
 
-#: src/cryptsetup_reencrypt.c:853 src/cryptsetup_reencrypt.c:859
+#: src/cryptsetup_reencrypt.c:803 src/cryptsetup_reencrypt.c:809
 msgid "Cannot open temporary LUKS header file.\n"
 msgstr "Nelze otevřít dočasný soubor s hlavičkou LUKS.\n"
 
-#: src/cryptsetup_reencrypt.c:865
+#: src/cryptsetup_reencrypt.c:815
 msgid "Cannot get device size.\n"
 msgstr "Velikost zařízení nelze zjistit.\n"
 
-#: src/cryptsetup_reencrypt.c:887
+#: src/cryptsetup_reencrypt.c:839
 msgid "Interrupted by a signal.\n"
 msgstr "Přerušeno signálem.\n"
 
-#: src/cryptsetup_reencrypt.c:889
+#: src/cryptsetup_reencrypt.c:841
 msgid "IO error during reencryption.\n"
 msgstr "Chyba vstupu/výstupu během přešifrování.\n"
 
-#: src/cryptsetup_reencrypt.c:990
+#: src/cryptsetup_reencrypt.c:942
 msgid "Key file can be used only with --key-slot or with exactly one key slot active.\n"
 msgstr ""
 "Soubor s klíčem lze použít jen s přepínačem --key-slot nebo s právě jednou\n"
 "aktivní pozicí klíče.\n"
 
-#: src/cryptsetup_reencrypt.c:1032
+#: src/cryptsetup_reencrypt.c:984
 msgid "Enter any LUKS passphrase: "
 msgstr "Zadejte jakékoliv heslo LUKS: "
 
-#: src/cryptsetup_reencrypt.c:1039
+#: src/cryptsetup_reencrypt.c:991
 #, c-format
 msgid "Enter LUKS passphrase for key slot %u: "
 msgstr "Zadejte LUKS heslo pro pozici klíče %u: "
 
-#: src/cryptsetup_reencrypt.c:1088
+#: src/cryptsetup_reencrypt.c:1040
 msgid "Cannot open reencryption log file.\n"
 msgstr "Nelze otevřít soubor s protokolem přešifrování.\n"
 
-#: src/cryptsetup_reencrypt.c:1216
+#: src/cryptsetup_reencrypt.c:1144
 msgid "Reencryption block size"
 msgstr "Velikost bloku přešifrování"
 
-#: src/cryptsetup_reencrypt.c:1216
+#: src/cryptsetup_reencrypt.c:1144
 msgid "MiB"
 msgstr "MiB"
 
-#: src/cryptsetup_reencrypt.c:1226
+#: src/cryptsetup_reencrypt.c:1154
 msgid "Use direct-io when accesing devices."
 msgstr "K zařízením se bude přistupovat pomocí přímého I/O."
 
-#: src/cryptsetup_reencrypt.c:1227
+#: src/cryptsetup_reencrypt.c:1155
 msgid "Use fsync after each block."
 msgstr "Po každém bloku se zavolá fsync."
 
-#: src/cryptsetup_reencrypt.c:1228
+#: src/cryptsetup_reencrypt.c:1156
 msgid "Update log file after every block."
 msgstr "Po každém bloku se aktualizuje soubor s protokolem."
 
-#: src/cryptsetup_reencrypt.c:1229
+#: src/cryptsetup_reencrypt.c:1157
 msgid "Use only this slot (others will be disabled)."
 msgstr "Použije se pouze tato pozice (ostatní budou zakázány)."
 
-#: src/cryptsetup_reencrypt.c:1232
+#: src/cryptsetup_reencrypt.c:1160
 msgid "Reduce data device size (move data offset). DANGEROUS!"
 msgstr "Zmenší velikost datového zařízení (posune začátek dat). NEBEZPEČNÉ!"
 
-#: src/cryptsetup_reencrypt.c:1233
+#: src/cryptsetup_reencrypt.c:1161
+msgid "Use only specified device size (ignore rest of device). DANGEROUS!"
+msgstr "Použije zadanou velikost zařízení (ignoruje zbytek zařízení). NEBEZPEČNÉ!"
+
+#: src/cryptsetup_reencrypt.c:1162
 msgid "Create new header on not encrypted device."
 msgstr "Vytvoří novou hlavičku na nešifrovaném zařízení."
 
-#: src/cryptsetup_reencrypt.c:1249
+#: src/cryptsetup_reencrypt.c:1178
 msgid "[OPTION...] <device>"
 msgstr "[PŘEPÍNAČ…] <zařízení>"
 
-#: src/cryptsetup_reencrypt.c:1263
+#: src/cryptsetup_reencrypt.c:1192
 msgid "WARNING: this is experimental code, it can completely break your data.\n"
 msgstr "POZOR: toto je pokusný kód, může zničit vaše data.\n"
 
-#: src/cryptsetup_reencrypt.c:1264
+#: src/cryptsetup_reencrypt.c:1193
 #, c-format
 msgid "Reencryption will change: volume key%s%s%s%s.\n"
 msgstr "Přešifrování změní: klíč svazku%s%s%s%s.\n"
 
-#: src/cryptsetup_reencrypt.c:1265
+#: src/cryptsetup_reencrypt.c:1194
 msgid ", set hash to "
 msgstr ", nastaví haš na "
 
-#: src/cryptsetup_reencrypt.c:1266
+#: src/cryptsetup_reencrypt.c:1195
 msgid ", set cipher to "
 msgstr ", nastaví šifru na "
 
-#: src/cryptsetup_reencrypt.c:1271
+#: src/cryptsetup_reencrypt.c:1200
 msgid "Argument required."
 msgstr "Vyžadován argument."
 
-# FIXME: Missing space after 1.
-#: src/cryptsetup_reencrypt.c:1288
-msgid "Only values between 1MiB and 64 MiB allowed for reencryption block size."
-msgstr "Velikost bloku při přešifrování může nabývat hodnot pouze mezi 1 a 64  MiB."
+#: src/cryptsetup_reencrypt.c:1216
+msgid "Only values between 1 MiB and 64 MiB allowed for reencryption block size."
+msgstr "Velikost bloku při přešifrování může nabývat hodnot pouze mezi 1 a 64 MiB."
 
-#: src/cryptsetup_reencrypt.c:1293
+#: src/cryptsetup_reencrypt.c:1235 src/cryptsetup_reencrypt.c:1240
+msgid "Invalid device size specification."
+msgstr "Zadána neplatná velikost zařízení."
+
+#: src/cryptsetup_reencrypt.c:1243
 msgid "Maximum device reduce size is 64 MiB."
 msgstr "Maximální velikost zmenšení zařízení je 64 MiB."
 
-#: src/cryptsetup_reencrypt.c:1311
-msgid "Option --new must be used together with --reduce_device_size."
-msgstr "Přepínač --new musí být použit spolu s --reduce_device_size."
+#: src/cryptsetup_reencrypt.c:1246
+msgid "Reduce size must be multiple of 512 bytes sector."
+msgstr "Velikost zmenšení musí být násobkem 512bajtových sektorů."
+
+#: src/cryptsetup_reencrypt.c:1250
+msgid "Option --new must be used together with --reduce-device-size."
+msgstr "Přepínač --new musí být použit spolu s --reduce-device-size."
+
+#: src/utils_tools.c:114
+msgid "Command successful.\n"
+msgstr "Příkaz úspěšně vykonán.\n"
+
+#: src/utils_tools.c:128
+#, c-format
+msgid "Command failed with code %i"
+msgstr "Příkaz selhal s kódem %i"
+
+#~ msgid "Cannot open device %s for %s%s access.\n"
+#~ msgstr "Zařízení %s nelze otevřít pro %s%s přístup.\n"
+
+#~ msgid "exclusive "
+#~ msgstr "výlučný "
+
+#~ msgid "writable"
+#~ msgstr "zápisový"
+
+#~ msgid "read-only"
+#~ msgstr "jen pro čtení"
+
+#~ msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
+#~ msgstr "POZOR!!! Zřejmě nezabezpečená paměť. Jste root?\n"
+
+#~ msgid "Unable to obtain sector size for %s"
+#~ msgstr "Není možné zjistit velikost sektoru u %s"
+
+#~ msgid "Failed to write to key storage.\n"
+#~ msgstr "Zápis do úložiště klíče selhal.\n"
+
+#~ msgid "Failed to read from key storage.\n"
+#~ msgstr "Čtení z úložiště klíče selhalo.\n"
 
 #~ msgid "Device %s is busy.\n"
 #~ msgstr "Zařízení %s je stále používáno.\n"
diff --git a/po/de.po b/po/de.po
index d402ea6..a6ea739 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,27 +7,32 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cryptsetup 1.4.3\n"
+"Project-Id-Version: cryptsetup 1.5.1\n"
 "Report-Msgid-Bugs-To: dm-crypt@saout.de\n"
-"POT-Creation-Date: 2012-05-22 23:31+0200\n"
-"PO-Revision-Date: 2012-05-26 15:04+0100\n"
+"POT-Creation-Date: 2012-09-19 15:48+0200\n"
+"PO-Revision-Date: 2012-10-13 16:20+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: lib/libdevmapper.c:184
+#: lib/libdevmapper.c:230
+msgid "Cannot initialize device-mapper, running as non-root user.\n"
+msgstr "Kann die Gerätezuordnung nicht initialisieren, da das Programm nicht mit Root-Rechten läuft.\n"
+
+#: lib/libdevmapper.c:233
 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n"
 msgstr "Kann die Gerätezuordnung nicht initialisieren. Ist das Kernelmodul dm_mod geladen?\n"
 
-#: lib/libdevmapper.c:423
+#: lib/libdevmapper.c:516
 #, c-format
 msgid "DM-UUID for device %s was truncated.\n"
 msgstr "DM-UUID für Gerät %s wurde abgeschnitten.\n"
 
-#: lib/random.c:75
+#: lib/random.c:74
 msgid ""
 "System is out of entropy while generating volume key.\n"
 "Please move mouse or type some text in another window to gather some random events.\n"
@@ -35,341 +40,358 @@ msgstr ""
 "Das System hat keine Entropie mehr, um den Laufwerksschlüssel zu generieren.\n"
 "Bitte bewegen Sie die Maus oder tippen Sie etwas Text in ein anderes Fenster, um einige zufällige Ereignisse zu sammeln.\n"
 
-#: lib/random.c:79
+#: lib/random.c:78
 #, c-format
 msgid "Generating key (%d%% done).\n"
 msgstr "Generiere Schlüssel (%d%% erledigt).\n"
 
-#: lib/random.c:168
+#: lib/random.c:167
 msgid "Fatal error during RNG initialisation.\n"
 msgstr "Fataler Fehler während der Initialisierung des Zufallszahlengenerators.\n"
 
-#: lib/random.c:205
+#: lib/random.c:204
 msgid "Unknown RNG quality requested.\n"
 msgstr "Unbekannte Verschlüsselungsqualität verlangt.\n"
 
-#: lib/random.c:210
+#: lib/random.c:209
 #, c-format
 msgid "Error %d reading from RNG: %s\n"
 msgstr "Fehler %d beim Einlesen vom Zufallszahlengenerator: %s\n"
 
-#: lib/setup.c:162
+#: lib/setup.c:179
 msgid "Cannot initialize crypto RNG backend.\n"
 msgstr "Kann das Krypto-Zufallszahlengenerator-Backend nicht initialisieren.\n"
 
-#: lib/setup.c:168
+#: lib/setup.c:185
 msgid "Cannot initialize crypto backend.\n"
 msgstr "Kann das Krypto-Backend nicht initialisieren.\n"
 
-#: lib/setup.c:190
+#: lib/setup.c:208 lib/setup.c:1060 lib/verity/verity.c:120
 #, c-format
 msgid "Hash algorithm %s not supported.\n"
 msgstr "Hash-Algorithmus %s wird nicht unterstützt.\n"
 
-#: lib/setup.c:193 lib/loopaes/loopaes.c:87
+#: lib/setup.c:211 lib/loopaes/loopaes.c:88
 #, c-format
 msgid "Key processing error (using hash %s).\n"
 msgstr "Fehler beim Verarbeiten des Schlüssels (mit Hash %s).\n"
 
-#: lib/setup.c:229
+#: lib/setup.c:252
 msgid "All key slots full.\n"
 msgstr "Alle Schlüsselfächer voll.\n"
 
-#: lib/setup.c:236
+#: lib/setup.c:259
 #, c-format
 msgid "Key slot %d is invalid, please select between 0 and %d.\n"
 msgstr "Schlüsselfach %d ist ungültig, bitte wählen Sie eins zwischen 0 und %d.\n"
 
-#: lib/setup.c:242
+#: lib/setup.c:265
 #, c-format
 msgid "Key slot %d is full, please select another one.\n"
 msgstr "Schlüsselfach %d ist voll, bitte wählen Sie ein anderes.\n"
 
-#: lib/setup.c:345
+#: lib/setup.c:379
 #, c-format
 msgid "Enter passphrase for %s: "
 msgstr "Geben Sie den Passsatz für %s ein: "
 
-#: lib/setup.c:505
-msgid "Cannot find a free loopback device.\n"
-msgstr "Kann kein freies Loopback-Gerät finden.\n"
-
-#: lib/setup.c:513
-msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
-msgstr "Anklemmen des Loopback-Geräts fehlgeschlagen (das Loopback-Gerät benötigt den autoclear-Schalter).\n"
-
-#: lib/setup.c:569
+#: lib/setup.c:560
 #, c-format
-msgid "LUKS header detected but device %s is too small.\n"
+msgid "Header detected but device %s is too small.\n"
 msgstr "LUKS-Kopfbereich gefunden, aber Gerät %s ist zu klein.\n"
 
-#: lib/setup.c:585 lib/setup.c:1073
+#: lib/setup.c:576 lib/setup.c:1278
 msgid "This operation is not supported for this device type.\n"
 msgstr "Diese Operation wird für diese Geräteart nicht unterstützt.\n"
 
-#: lib/setup.c:648 lib/setup.c:1040 lib/setup.c:1810
+#: lib/setup.c:782 lib/setup.c:1242 lib/setup.c:2034
 #, c-format
 msgid "Device %s is not active.\n"
 msgstr "Gerät %s ist nicht aktiv.\n"
 
-#: lib/setup.c:666
+#: lib/setup.c:799
 #, c-format
 msgid "Underlying device for crypt device %s disappeared.\n"
 msgstr "Zugrundeliegendes Gerät für das Kryptogerät %s ist verschwunden.\n"
 
-#: lib/setup.c:780
+#: lib/setup.c:862
 msgid "Invalid plain crypt parameters.\n"
 msgstr "Ungültige Parameter für Plain-Verschlüsselung.\n"
 
-#: lib/setup.c:785 lib/setup.c:890
+#: lib/setup.c:867 lib/setup.c:989
 msgid "Invalid key size.\n"
 msgstr "Ungültige Schlüsselgröße.\n"
 
-#: lib/setup.c:826
+#: lib/setup.c:911
 msgid "Can't format LUKS without device.\n"
 msgstr "Ohne Gerät kann LUKS nicht formatiert werden.\n"
 
-#: lib/setup.c:864
+#: lib/setup.c:959
 #, c-format
 msgid "Cannot format device %s which is still in use.\n"
 msgstr "Kann Gerät %s nicht formatieren, da es noch in Betrieb ist.\n"
 
-#: lib/setup.c:867
+#: lib/setup.c:962
+#, c-format
+msgid "Cannot format device %s, permission denied.\n"
+msgstr "Kann Gerät %s nicht formatieren, Zugriff verweigert.\n"
+
+#: lib/setup.c:966
 #, c-format
 msgid "Cannot wipe header on device %s.\n"
 msgstr "Kann den Kopfbereich auf Gerät %s nicht auslöschen.\n"
 
-#: lib/setup.c:885
+#: lib/setup.c:984
 msgid "Can't format LOOPAES without device.\n"
 msgstr "Ohne Gerät kann LOOPAES nicht formatiert werden.\n"
 
-#: lib/setup.c:945
+#: lib/setup.c:1020
+msgid "Can't format VERITY without device.\n"
+msgstr "Ohne Geräteangabe kann VERITY nicht formatiert werden.\n"
+
+#: lib/setup.c:1028 lib/verity/verity.c:103
+#, c-format
+msgid "Unsupported VERITY hash type %d.\n"
+msgstr "Nicht unterstützte VERITY-Hash-Art %d.\n"
+
+#: lib/setup.c:1034 lib/verity/verity.c:111
+msgid "Unsupported VERITY block size.\n"
+msgstr "Nicht unterstützte VERITY-Blockgröße.\n"
+
+#: lib/setup.c:1039 lib/verity/verity.c:74
+msgid "Unsupported VERITY hash offset.\n"
+msgstr "Nicht unterstützter VERITY-Hash-Offset.\n"
+
+#: lib/setup.c:1151
 #, c-format
 msgid "Unknown crypt device type %s requested.\n"
 msgstr "Unbekannte Art des Verschlüsselungsgeräts %s verlangt.\n"
 
-#: lib/setup.c:1088
+#: lib/setup.c:1293
 msgid "Do you really want to change UUID of device?"
 msgstr "Wollen Sie wirklich die UUID des Geräts ändern?"
 
-#: lib/setup.c:1173 lib/setup.c:1220 lib/setup.c:1269 lib/setup.c:1335
-#: lib/setup.c:1411 lib/setup.c:1492 lib/setup.c:1538 lib/setup.c:1875
-#: lib/setup.c:1980 lib/setup.c:2119
+#: lib/setup.c:1379 lib/setup.c:1424 lib/setup.c:1473 lib/setup.c:1539
+#: lib/setup.c:1615 lib/setup.c:1696 lib/setup.c:1742 lib/setup.c:2099
+#: lib/setup.c:2382
 msgid "This operation is supported only for LUKS device.\n"
 msgstr "Diese Operation wird nur für LUKS-Geräte unterstützt.\n"
 
-#: lib/setup.c:1180
+#: lib/setup.c:1386
 #, c-format
 msgid "Volume %s is not active.\n"
 msgstr "Laufwerk %s ist nicht aktiv.\n"
 
-#: lib/setup.c:1192
+#: lib/setup.c:1397
 #, c-format
 msgid "Volume %s is already suspended.\n"
 msgstr "Laufwerk %s ist bereits abgeschaltet.\n"
 
-#: lib/setup.c:1230 lib/setup.c:1279
+#: lib/setup.c:1434 lib/setup.c:1483
 #, c-format
 msgid "Volume %s is not suspended.\n"
 msgstr "Laufwerk %s ist nicht abgeschaltet.\n"
 
-#: lib/setup.c:1286 lib/setup.c:1663 lib/setup.c:1677 src/cryptsetup.c:343
+#: lib/setup.c:1490 lib/setup.c:1867 lib/setup.c:1881 src/cryptsetup.c:194
 msgid "Enter passphrase: "
 msgstr "Passsatz eingeben: "
 
-#: lib/setup.c:1349 lib/setup.c:1425
+#: lib/setup.c:1553 lib/setup.c:1629
 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n"
 msgstr "Kann kein Schlüsselfach hinzufügen, alle Fächer sind deaktiviert und kein Laufwerksschlüssel angegeben.\n"
 
-#: lib/setup.c:1358 lib/setup.c:1431 lib/setup.c:1435
+#: lib/setup.c:1562 lib/setup.c:1635 lib/setup.c:1639
 msgid "Enter any passphrase: "
 msgstr "Geben Sie irgendeinen Passsatz ein: "
 
-#: lib/setup.c:1375 lib/setup.c:1448 lib/setup.c:1452 lib/setup.c:1515
+#: lib/setup.c:1579 lib/setup.c:1652 lib/setup.c:1656 lib/setup.c:1719
 msgid "Enter new passphrase for key slot: "
 msgstr "Geben Sie den neuen Passsatz für das Schlüsselfach ein: "
 
-#: lib/setup.c:1506 lib/setup.c:1767 lib/setup.c:1780 lib/setup.c:1886
+#: lib/setup.c:1710 lib/setup.c:1971 lib/setup.c:1984 lib/setup.c:2110
 msgid "Volume key does not match the volume.\n"
 msgstr "Der Laufwerksschlüssel passt nicht zum Laufwerk.\n"
 
-#: lib/setup.c:1544
+#: lib/setup.c:1748
 #, c-format
 msgid "Key slot %d is invalid.\n"
 msgstr "Schlüsselfach %d ist ungültig.\n"
 
-#: lib/setup.c:1549
+#: lib/setup.c:1753
 #, c-format
 msgid "Key slot %d is not used.\n"
 msgstr "Schlüsselfach %d ist unbenutzt.\n"
 
-#: lib/setup.c:1579 lib/setup.c:1651 lib/setup.c:1743
+#: lib/setup.c:1783 lib/setup.c:1855 lib/setup.c:1947
 #, c-format
 msgid "Device %s already exists.\n"
 msgstr "Das Gerät %s existiert bereits.\n"
 
-#: lib/setup.c:1754
+#: lib/setup.c:1958
 msgid "Incorrect volume key specified for plain device.\n"
 msgstr "Falscher Laufwerksschlüssel für Plain-Gerät angegeben.\n"
 
-#: lib/setup.c:1785
+#: lib/setup.c:1991
+msgid "Incorrect root hash specified for verity device.\n"
+msgstr "Falscher Root-Hash-Schlüssel für VERITY-Gerät angegeben.\n"
+
+#: lib/setup.c:2009
 msgid "Device type is not properly initialised.\n"
 msgstr "Gerätetyp ist nicht richtig initialisiert.\n"
 
-#: lib/setup.c:1814
+#: lib/setup.c:2038
 #, c-format
 msgid "Invalid device %s.\n"
 msgstr "Ungültiges Gerät %s.\n"
 
-#: lib/setup.c:1842
+#: lib/setup.c:2066
 msgid "Volume key buffer too small.\n"
 msgstr "Laufwerks-Schlüsselpuffer zu klein.\n"
 
-#: lib/setup.c:1850
+#: lib/setup.c:2074
 msgid "Cannot retrieve volume key for plain device.\n"
 msgstr "Kann Laufwerksschlüssel für Plain-Gerät nicht ermitteln.\n"
 
-#: lib/setup.c:1856
+#: lib/setup.c:2080
 #, c-format
 msgid "This operation is not supported for %s crypt device.\n"
 msgstr "Diese Operation wird für Kryptogerät %s nicht unterstützt.\n"
 
-#: lib/utils.c:270
-#, c-format
-msgid "Device %s doesn't exist or access denied.\n"
-msgstr "Gerät %s existiert nicht oder ist vor Zugriffen geschützt.\n"
-
-#: lib/utils.c:280
-#, c-format
-msgid "Cannot open device %s for %s%s access.\n"
-msgstr "Kann Gerät %s nicht zum %s%szugriff öffnen.\n"
-
-#: lib/utils.c:281
-msgid "exclusive "
-msgstr "exklusiven"
-
-#: lib/utils.c:282
-msgid "writable"
-msgstr "Schreib"
-
-#: lib/utils.c:282
-msgid "read-only"
-msgstr "Lese"
-
-#: lib/utils.c:289
-#, c-format
-msgid "Cannot read device %s.\n"
-msgstr "Kann nicht von Gerät %s lesen.\n"
-
-#: lib/utils.c:386
-#, c-format
-msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
-msgstr "Kann Gerät %s nicht nutzen, da es bereits in Betrieb ist.\n"
-
-#: lib/utils.c:390
-#, c-format
-msgid "Cannot get info about device %s.\n"
-msgstr "Kann Infos über Gerät %s nicht bekommen.\n"
-
-#: lib/utils.c:396
-#, c-format
-msgid "Requested offset is beyond real size of device %s.\n"
-msgstr "Der angeforderte Offset ist jenseits der wirklichen Größe des Geräts »%s«.\n"
+#: lib/setup.c:2275
+msgid "Dump operation is not supported for this device type.\n"
+msgstr "Die Dump-Operation wird für diese Geräteart nicht unterstützt.\n"
 
-#: lib/utils.c:404
-#, c-format
-msgid "Device %s has zero size.\n"
-msgstr "Gerät %s hat die Größe 0.\n"
-
-#: lib/utils.c:415 lib/luks1/keymanage.c:532
-#, c-format
-msgid "Device %s is too small.\n"
-msgstr "Gerät %s ist zu klein.\n"
-
-#: lib/utils.c:439
-msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
-msgstr "WARNUNG!!! Möglicherweise unsicherer Speicher. Sind Sie Root?\n"
-
-#: lib/utils.c:445
+#: lib/utils.c:238
 msgid "Cannot get process priority.\n"
 msgstr "Kann Prozesspriorität nicht ermitteln.\n"
 
-#: lib/utils.c:448 lib/utils.c:461
+#: lib/utils.c:241 lib/utils.c:254
 #, c-format
 msgid "setpriority %d failed: %s\n"
 msgstr "setpriority %d fehlgeschlagen: %s\n"
 
-#: lib/utils.c:459
+#: lib/utils.c:252
 msgid "Cannot unlock memory.\n"
 msgstr "Kann Speicher nicht entsperren.\n"
 
-#: lib/utils_crypt.c:221 lib/utils_crypt.c:234 lib/utils_crypt.c:338
-#: lib/utils_crypt.c:354
+#: lib/utils_crypt.c:225 lib/utils_crypt.c:238 lib/utils_crypt.c:385
+#: lib/utils_crypt.c:400
 msgid "Out of memory while reading passphrase.\n"
 msgstr "Zu wenig Speicher zum Einlesen des Passsatzes.\n"
 
-#: lib/utils_crypt.c:226 lib/utils_crypt.c:241
+#: lib/utils_crypt.c:230 lib/utils_crypt.c:245
 msgid "Error reading passphrase from terminal.\n"
 msgstr "Fehler beim Lesen des Passsatzes vom Terminal.\n"
 
-#: lib/utils_crypt.c:239
+#: lib/utils_crypt.c:243
 msgid "Verify passphrase: "
 msgstr "Passsatz wiederholen: "
 
-#: lib/utils_crypt.c:246
+#: lib/utils_crypt.c:250
 msgid "Passphrases do not match.\n"
 msgstr "Passsätze stimmen nicht überein.\n"
 
-#: lib/utils_crypt.c:287
+#: lib/utils_crypt.c:334
 msgid "Cannot use offset with terminal input.\n"
 msgstr "Kann Offset nicht mit Terminaleingabe nutzen.\n"
 
-#: lib/utils_crypt.c:306
+#: lib/utils_crypt.c:353
 msgid "Failed to open key file.\n"
 msgstr "Konnte Schlüsseldatei nicht öffnen.\n"
 
-#: lib/utils_crypt.c:315
+#: lib/utils_crypt.c:362
 msgid "Failed to stat key file.\n"
 msgstr "Konnte Infos zur Schlüsseldatei nicht bekommen.\n"
 
-#: lib/utils_crypt.c:323 lib/utils_crypt.c:345
+#: lib/utils_crypt.c:370 lib/utils_crypt.c:391
 msgid "Cannot seek to requested keyfile offset.\n"
 msgstr "Kann nicht zur gewünschten Position in der Schlüsseldatei springen.\n"
 
-#: lib/utils_crypt.c:362
+#: lib/utils_crypt.c:408
 msgid "Error reading passphrase.\n"
 msgstr "Fehler beim Einlesen des Passsatzes.\n"
 
-#: lib/utils_crypt.c:380
+#: lib/utils_crypt.c:426
 msgid "Maximum keyfile size exceeded.\n"
 msgstr "Größenbegrenzung für die Schlüsseldatei überschritten.\n"
 
-#: lib/utils_crypt.c:385
+#: lib/utils_crypt.c:431
 msgid "Cannot read requested amount of data.\n"
 msgstr "Kann die gewünschte Menge an Daten nicht lesen.\n"
 
-#: lib/utils_fips.c:45
+#: lib/utils_fips.c:46
 msgid "FIPS checksum verification failed.\n"
 msgstr "FIPS-Prüfsummen-Verifizierung fehlgeschlagen.\n"
 
-#: lib/utils_fips.c:49
+#: lib/utils_fips.c:50
 msgid "Running in FIPS mode.\n"
 msgstr "Laufe im FIPS-Modus.\n"
 
-#: lib/luks1/keyencryption.c:79
+#: lib/utils_device.c:48
 #, c-format
-msgid "Unable to obtain sector size for %s"
-msgstr "Kann Sektorengröße für %s nicht ermitteln."
+msgid "Device %s doesn't exist or access denied.\n"
+msgstr "Gerät %s existiert nicht oder ist vor Zugriffen geschützt.\n"
+
+#: lib/utils_device.c:58 lib/luks1/keymanage.c:298 lib/luks1/keymanage.c:527
+#: lib/luks1/keymanage.c:567 lib/verity/verity.c:80 lib/verity/verity.c:174
+#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:304
+#: lib/verity/verity_hash.c:324
+#, c-format
+msgid "Cannot open device %s.\n"
+msgstr "Kann Gerät %s nicht öffnen.\n"
+
+#: lib/utils_device.c:333
+msgid "Cannot use a loopback device, running as non-root user.\n"
+msgstr "Kann das Loopback-Gerät nicht benutzen, weil das Programm nicht mit Root-Rechten läuft.\n"
+
+#: lib/utils_device.c:336
+msgid "Cannot find a free loopback device.\n"
+msgstr "Kann kein freies Loopback-Gerät finden.\n"
+
+#: lib/utils_device.c:343
+msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
+msgstr "Anklemmen des Loopback-Geräts fehlgeschlagen (das Loopback-Gerät benötigt den autoclear-Schalter).\n"
 
-#: lib/luks1/keyencryption.c:106
+#: lib/utils_device.c:383
+#, c-format
+msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
+msgstr "Kann Gerät %s nicht nutzen, da es bereits in Betrieb ist.\n"
+
+#: lib/utils_device.c:387
+#, c-format
+msgid "Cannot get info about device %s.\n"
+msgstr "Kann Infos über Gerät %s nicht bekommen.\n"
+
+#: lib/utils_device.c:393
+#, c-format
+msgid "Requested offset is beyond real size of device %s.\n"
+msgstr "Der angeforderte Offset ist jenseits der wirklichen Größe des Geräts »%s«.\n"
+
+#: lib/utils_device.c:401
+#, c-format
+msgid "Device %s has zero size.\n"
+msgstr "Gerät %s hat die Größe 0.\n"
+
+#: lib/utils_device.c:412 lib/luks1/keymanage.c:89
+#, c-format
+msgid "Device %s is too small.\n"
+msgstr "Gerät %s ist zu klein.\n"
+
+#: lib/luks1/keyencryption.c:66 lib/luks1/keymanage.c:295
+#: lib/luks1/keymanage.c:564 lib/luks1/keymanage.c:981
+#, c-format
+msgid "Cannot write to device %s, permission denied.\n"
+msgstr "Kann nicht auf Gerät »%s« schreiben, Zugriff verweigert.\n"
+
+#: lib/luks1/keyencryption.c:91
 msgid "Key size in XTS mode must be 256 or 512 bits.\n"
 msgstr "Schlüsselgröße im XTS-Modus muss entweder 256 oder 512 Bits sein.\n"
 
-#: lib/luks1/keyencryption.c:129
+#: lib/luks1/keyencryption.c:117
 msgid "Failed to obtain device mapper directory."
 msgstr "Kann Gerätezuordnungsverzeichnis nicht ermitteln."
 
-#: lib/luks1/keyencryption.c:145
+#: lib/luks1/keyencryption.c:133
 #, c-format
 msgid ""
 "Failed to setup dm-crypt key mapping for device %s.\n"
@@ -381,66 +403,67 @@ msgstr ""
 "(Sehen Sie im System-Log nach, ob sich dort Hinweise finden.)\n"
 "%s"
 
-#: lib/luks1/keyencryption.c:155
+#: lib/luks1/keyencryption.c:143
 msgid "Failed to open temporary keystore device.\n"
 msgstr "Öffnen des temporären Schlüsselspeichergeräts fehlgeschlagen.\n"
 
-#: lib/luks1/keyencryption.c:162
+#: lib/luks1/keyencryption.c:150
 msgid "Failed to access temporary keystore device.\n"
 msgstr "Zugriff auf das temporäre Schlüsselspeichergerät fehlgeschlagen.\n"
 
-#: lib/luks1/keymanage.c:149
+#: lib/luks1/keymanage.c:161
 #, c-format
 msgid "Requested file %s already exist.\n"
 msgstr "Angeforderte Datei %s existiert bereits.\n"
 
-#: lib/luks1/keymanage.c:169 lib/luks1/keymanage.c:399
+#: lib/luks1/keymanage.c:181 lib/luks1/keymanage.c:417
+#: src/cryptsetup_reencrypt.c:1014
 #, c-format
 msgid "Device %s is not a valid LUKS device.\n"
 msgstr "Gerät %s ist kein gültiges LUKS-Gerät.\n"
 
-#: lib/luks1/keymanage.c:189
+#: lib/luks1/keymanage.c:202
 #, c-format
 msgid "Cannot write header backup file %s.\n"
 msgstr "Kann Sicherungskopie %s des Kopfbereichs nicht schreiben.\n"
 
-#: lib/luks1/keymanage.c:216
+#: lib/luks1/keymanage.c:229
 #, c-format
 msgid "Backup file %s doesn't exist.\n"
 msgstr "Sicherungskopie %s existiert nicht.\n"
 
-#: lib/luks1/keymanage.c:224
+#: lib/luks1/keymanage.c:238
 msgid "Backup file doesn't contain valid LUKS header.\n"
 msgstr "Sicherungsdatei enthält keinen gültigen LUKS-Kopfbereich.\n"
 
-#: lib/luks1/keymanage.c:237
+#: lib/luks1/keymanage.c:251
 #, c-format
 msgid "Cannot open header backup file %s.\n"
 msgstr "Kann Sicherheitskopie %s des Kopfbereichs nicht öffnen.\n"
 
-#: lib/luks1/keymanage.c:243
+#: lib/luks1/keymanage.c:257
 #, c-format
 msgid "Cannot read header backup file %s.\n"
 msgstr "Kann Sicherheitskopie %s des Kopfbereichs nicht lesen.\n"
 
-#: lib/luks1/keymanage.c:254
+#: lib/luks1/keymanage.c:268
 msgid "Data offset or key size differs on device and backup, restore failed.\n"
 msgstr "Unterschiedliche Datenposition oder Schlüsselgröße zwischen Gerät und Sicherung, Wiederherstellung fehlgeschlagen.\n"
 
-#: lib/luks1/keymanage.c:262
+#: lib/luks1/keymanage.c:276
 #, c-format
 msgid "Device %s %s%s"
 msgstr "Gerät %s %s%s"
 
-#: lib/luks1/keymanage.c:263
+#: lib/luks1/keymanage.c:277
 msgid "does not contain LUKS header. Replacing header can destroy data on that device."
 msgstr "enthält keinen LUKS-Kopfbereich. Das Ersetzen des Kopfbereichs kann Daten auf dem Gerät zerstören."
 
-#: lib/luks1/keymanage.c:264
+#: lib/luks1/keymanage.c:278
 msgid "already contains LUKS header. Replacing header will destroy existing keyslots."
 msgstr "enthält bereits einen LUKS-Kopfbereich. Das Ersetzen des Kopfbereichs wird bestehende Schlüsselfächer zerstören."
 
-#: lib/luks1/keymanage.c:265
+#: lib/luks1/keymanage.c:279
 msgid ""
 "\n"
 "WARNING: real device header has different UUID than backup!"
@@ -448,364 +471,423 @@ msgstr ""
 "\n"
 "WARNUNG: Der Kopfbereich des echten Geräts hat eine andere UUID als die Sicherung!"
 
-#: lib/luks1/keymanage.c:280 lib/luks1/keymanage.c:504
-#: lib/luks1/keymanage.c:538
-#, c-format
-msgid "Cannot open device %s.\n"
-msgstr "Kann Gerät %s nicht öffnen.\n"
-
-#: lib/luks1/keymanage.c:310
+#: lib/luks1/keymanage.c:328
 msgid "Non standard key size, manual repair required.\n"
 msgstr "Ungewöhnliche Schlüsselgröße, manuelles Reparieren erforderlich.\n"
 
-#: lib/luks1/keymanage.c:315
+#: lib/luks1/keymanage.c:333
 msgid "Non standard keyslots alignment, manual repair required.\n"
 msgstr "Ungewöhnliche Ausrichtung der Schlüsselfächer, manuelles Reparieren erforderlich.\n"
 
-#: lib/luks1/keymanage.c:321
+#: lib/luks1/keymanage.c:339
 msgid "Repairing keyslots.\n"
 msgstr "Repariere Schlüsselfächer.\n"
 
-#: lib/luks1/keymanage.c:332
+#: lib/luks1/keymanage.c:350
 msgid "Repair failed."
 msgstr "Reparieren fehlgeschlagen."
 
-#: lib/luks1/keymanage.c:344
+#: lib/luks1/keymanage.c:362
 #, c-format
 msgid "Keyslot %i: offset repaired (%u -> %u).\n"
 msgstr "Schlüsselfach %i: Dateiposition repariert (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:352
+#: lib/luks1/keymanage.c:370
 #, c-format
 msgid "Keyslot %i: stripes repaired (%u -> %u).\n"
 msgstr "Schlüsselfach %i: Streifen repariert (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:361
+#: lib/luks1/keymanage.c:379
 #, c-format
 msgid "Keyslot %i: bogus partition signature.\n"
 msgstr "Schlüsselfach %i: schwindlerische Partitions-Signatur.\n"
 
-#: lib/luks1/keymanage.c:366
+#: lib/luks1/keymanage.c:384
 #, c-format
 msgid "Keyslot %i: salt wiped.\n"
 msgstr "Schlüsselfach %i: Salt gelöscht.\n"
 
-#: lib/luks1/keymanage.c:377
+#: lib/luks1/keymanage.c:395
 msgid "Writing LUKS header to disk.\n"
 msgstr "Schreibe LUKS-Kopfbereich auf die Platte.\n"
 
-#: lib/luks1/keymanage.c:402
+#: lib/luks1/keymanage.c:420
 #, c-format
 msgid "Unsupported LUKS version %d.\n"
 msgstr "Nicht unterstützte LUKS-Version %d.\n"
 
-#: lib/luks1/keymanage.c:408 lib/luks1/keymanage.c:610
+#: lib/luks1/keymanage.c:426 lib/luks1/keymanage.c:639
 #, c-format
 msgid "Requested LUKS hash %s is not supported.\n"
 msgstr "Verlangter LUKS-Hash %s wird nicht unterstützt.\n"
 
-#: lib/luks1/keymanage.c:423
+#: lib/luks1/keymanage.c:441
 #, c-format
 msgid "LUKS keyslot %u is invalid.\n"
 msgstr "LUKS-Schlüsselfach %u ist ungültig.\n"
 
-#: lib/luks1/keymanage.c:437 src/cryptsetup.c:535
+#: lib/luks1/keymanage.c:455 src/cryptsetup.c:388
 msgid "No known problems detected for LUKS header.\n"
 msgstr "Keine bekannten Probleme im LUKS-Header erkannt.\n"
 
-#: lib/luks1/keymanage.c:471
+#: lib/luks1/keymanage.c:488
 #, c-format
 msgid "Cannot open file %s.\n"
 msgstr "Kann Datei %s nicht öffnen.\n"
 
-#: lib/luks1/keymanage.c:559
+#: lib/luks1/keymanage.c:588
 #, c-format
 msgid "Error during update of LUKS header on device %s.\n"
 msgstr "Fehler beim Aktualisieren des LUKS-Kopfbereichs auf Gerät %s.\n"
 
-#: lib/luks1/keymanage.c:566
+#: lib/luks1/keymanage.c:595
 #, c-format
 msgid "Error re-reading LUKS header after update on device %s.\n"
 msgstr "Fehler beim Neueinlesen des LUKS-Kopfbereichs nach dem Aktualisieren auf Gerät %s.\n"
 
-#: lib/luks1/keymanage.c:578
+#: lib/luks1/keymanage.c:608
 #, c-format
 msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n"
 msgstr "Inkompatible PBKDF2-Optionen (mit Hash-Algorithmus %s).\n"
 
-#: lib/luks1/keymanage.c:615 lib/luks1/keymanage.c:697
+#: lib/luks1/keymanage.c:644 lib/luks1/keymanage.c:726
 msgid "Wrong LUKS UUID format provided.\n"
 msgstr "Falsches LUKS-UUID-Format angegeben.\n"
 
-#: lib/luks1/keymanage.c:640
+#: lib/luks1/keymanage.c:669
 msgid "Cannot create LUKS header: reading random salt failed.\n"
 msgstr "Kann LUKS-Kopfbereich nicht erzeugen: Lesen der zufälligen Streuung fehlgeschlagen.\n"
 
-#: lib/luks1/keymanage.c:657
+#: lib/luks1/keymanage.c:686
 #, c-format
 msgid "Cannot create LUKS header: header digest failed (using hash %s).\n"
 msgstr "Kann LUKS-Kopfbereich nicht erzeugen: Auszug des Kopfbereich fehlgeschlagen (mit Hash %s).\n"
 
-#: lib/luks1/keymanage.c:722
+#: lib/luks1/keymanage.c:751
 #, c-format
 msgid "Key slot %d active, purge first.\n"
 msgstr "Schlüsselfach %d aktiv, löschen Sie es erst.\n"
 
-#: lib/luks1/keymanage.c:727
+#: lib/luks1/keymanage.c:757
 #, c-format
 msgid "Key slot %d material includes too few stripes. Header manipulation?\n"
 msgstr "Material für Schlüsselfach %d enthält zu wenige Streifen. Manipulation des Kopfbereichs?\n"
 
-#: lib/luks1/keymanage.c:794
-msgid "Failed to write to key storage.\n"
-msgstr "Schreiben des Schlüsselspeichers fehlgeschlagen.\n"
-
-#: lib/luks1/keymanage.c:879
-msgid "Failed to read from key storage.\n"
-msgstr "Lesen des Schlüsselspeichers fehlgeschlagen.\n"
-
-#: lib/luks1/keymanage.c:889
+#: lib/luks1/keymanage.c:914
 #, c-format
 msgid "Key slot %d unlocked.\n"
 msgstr "Schlüsselfach %d entsperrt.\n"
 
-#: lib/luks1/keymanage.c:925 src/cryptsetup.c:732 src/cryptsetup.c:916
+#: lib/luks1/keymanage.c:949 src/cryptsetup.c:587 src/cryptsetup.c:771
+#: src/cryptsetup_reencrypt.c:918 src/cryptsetup_reencrypt.c:952
 msgid "No key available with this passphrase.\n"
 msgstr "Kein Schlüssel mit diesem Passsatz verfügbar.\n"
 
-#: lib/luks1/keymanage.c:943
+#: lib/luks1/keymanage.c:967
 #, c-format
 msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n"
 msgstr "Schlüsselfach %d ist ungültig, bitte wählen Sie ein Schlüsselfach zwischen 0 und %d.\n"
 
-#: lib/luks1/keymanage.c:957
+#: lib/luks1/keymanage.c:985
 #, c-format
 msgid "Cannot wipe device %s.\n"
 msgstr "Kann Gerät %s nicht auslöschen.\n"
 
-#: lib/loopaes/loopaes.c:142
+#: lib/loopaes/loopaes.c:143
 msgid "Detected not yet supported GPG encrypted keyfile.\n"
 msgstr "Noch nicht unterstützte GPG-Schlüsseldatei erkannt.\n"
 
-#: lib/loopaes/loopaes.c:143
+#: lib/loopaes/loopaes.c:144
 msgid "Please use gpg --decrypt <KEYFILE> | cryptsetup --keyfile=- ...\n"
 msgstr "Bitte benutzen Sie »gpg --decrypt <SCHLÜSSELDATEI> | cryptsetup --keyfile=- ...«\n"
 
-#: lib/loopaes/loopaes.c:175
+#: lib/loopaes/loopaes.c:176
 msgid "Incompatible loop-AES keyfile detected.\n"
 msgstr "Inkompatible Loop-AES-Schlüsseldatei erkannt.\n"
 
-#: lib/loopaes/loopaes.c:225
+#: lib/loopaes/loopaes.c:230
 msgid "Kernel doesn't support loop-AES compatible mapping.\n"
 msgstr "Kernel unterstützt Loop-AES-kompatibles Mapping nicht.\n"
 
-#: src/cryptsetup.c:105
+#: lib/verity/verity.c:69 lib/verity/verity.c:168
+msgid "Verity device doesn't use on-disk header.\n"
+msgstr "Verity-Gerät benutzt keinen Kopfbereich auf der Platte.\n"
+
+#: lib/verity/verity.c:92
+#, c-format
+msgid "Device %s is not a valid VERITY device.\n"
+msgstr "Gerät %s ist kein gültiges VERITY-Gerät.\n"
+
+#: lib/verity/verity.c:98
+#, c-format
+msgid "Unsupported VERITY version %d.\n"
+msgstr "Nicht unterstützte VERITY-Version %d.\n"
+
+#: lib/verity/verity.c:128
+msgid "VERITY header corrupted.\n"
+msgstr "VERITY-Header verfälscht.\n"
+
+#: lib/verity/verity.c:163
+msgid "Wrong VERITY UUID format provided.\n"
+msgstr "Falsches VERITY-UUID-Format angegeben.\n"
+
+#: lib/verity/verity.c:191
+#, c-format
+msgid "Error during update of verity header on device %s.\n"
+msgstr "Fehler beim Aktualisieren des VERITY-Kopfbereichs auf Gerät %s.\n"
+
+#: lib/verity/verity.c:270
+msgid "Kernel doesn't support dm-verity mapping.\n"
+msgstr "Kernel unterstützt dm-verity-Zuordnung nicht.\n"
+
+#: lib/verity/verity.c:281
+msgid "Verity device detected corruption after activation.\n"
+msgstr "Verity-Gerät hat eine Verfälschung nach der Aktivierung festgestellt.\n"
+
+#: lib/verity/verity_hash.c:58
+#, c-format
+msgid "Spare area is not zeroed at position %<PRIu64>.\n"
+msgstr "Zusätzlicher Platz ist nicht ausgenullt an Position %<PRIu64>.\n"
+
+#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:248
+#: lib/verity/verity_hash.c:278 lib/verity/verity_hash.c:285
+msgid "Device offset overflow.\n"
+msgstr "Überlauf beim Geräte-Offset.\n"
+
+#: lib/verity/verity_hash.c:160
+#, c-format
+msgid "Verification failed at position %<PRIu64>.\n"
+msgstr "Verifikation fehlgeschlagen an Position %<PRIu64>.\n"
+
+#: lib/verity/verity_hash.c:234
+msgid "Invalid size parameters for verity device.\n"
+msgstr "Ungültige Größenparameter für Verity-Gerät.\n"
+
+#: lib/verity/verity_hash.c:266
+msgid "Too many tree levels for verity volume.\n"
+msgstr "Zu viele Ebenen für Verity-Laufwerk.\n"
+
+#: lib/verity/verity_hash.c:355
+msgid "Verification of data area failed.\n"
+msgstr "Verifikation des Datenbereichs fehlgeschlagen.\n"
+
+#: lib/verity/verity_hash.c:360
+msgid "Verification of root hash failed.\n"
+msgstr "Verifikation des Root-Hashes fehlgeschlagen.\n"
+
+#: lib/verity/verity_hash.c:366
+msgid "Input/output error while creating hash area.\n"
+msgstr "E/A-Fehler beim Anlegen des Hash-Bereiches.\n"
+
+#: lib/verity/verity_hash.c:368
+msgid "Creation of hash area failed.\n"
+msgstr "Anlegen des Hash-Bereiches fehlgeschlagen.\n"
+
+#: lib/verity/verity_hash.c:415
+#, c-format
+msgid "WARNING: Kernel cannot activate device if data block size exceeds page size (%u).\n"
+msgstr "WARNUNG: Kernel kann das Gerät nicht aktivieren, wenn die Datenblockgröße die Seitengröße (%u) übersteigt.\n"
+
+#: src/cryptsetup.c:88
 msgid "<name> <device>"
 msgstr "<Name> <Gerät>"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "create device"
 msgstr "Gerät erzeugen"
 
-#: src/cryptsetup.c:106 src/cryptsetup.c:107 src/cryptsetup.c:108
-#: src/cryptsetup.c:118 src/cryptsetup.c:125
+#: src/cryptsetup.c:89 src/cryptsetup.c:90 src/cryptsetup.c:91
+#: src/cryptsetup.c:101 src/cryptsetup.c:108 src/veritysetup.c:311
+#: src/veritysetup.c:312
 msgid "<name>"
 msgstr "<Name>"
 
-#: src/cryptsetup.c:106
+#: src/cryptsetup.c:89
 msgid "remove device"
 msgstr "Gerät entfernen"
 
-#: src/cryptsetup.c:107
+#: src/cryptsetup.c:90
 msgid "resize active device"
 msgstr "Größe des aktiven Geräts ändern"
 
-#: src/cryptsetup.c:108
+#: src/cryptsetup.c:91
 msgid "show device status"
 msgstr "Gerätestatus anzeigen"
 
-#: src/cryptsetup.c:109 src/cryptsetup.c:116 src/cryptsetup.c:117
-#: src/cryptsetup.c:119 src/cryptsetup.c:120 src/cryptsetup.c:121
-#: src/cryptsetup.c:122 src/cryptsetup.c:123
+#: src/cryptsetup.c:92 src/cryptsetup.c:99 src/cryptsetup.c:100
+#: src/cryptsetup.c:102 src/cryptsetup.c:103 src/cryptsetup.c:104
+#: src/cryptsetup.c:105 src/cryptsetup.c:106
 msgid "<device>"
 msgstr "<Gerät>"
 
-#: src/cryptsetup.c:109
+#: src/cryptsetup.c:92
 msgid "try to repair on-disk metadata"
 msgstr "Versuche die Auf-Platte-Metadaten zu reparieren"
 
-#: src/cryptsetup.c:110 src/cryptsetup.c:112
+#: src/cryptsetup.c:93 src/cryptsetup.c:95
 msgid "<device> [<new key file>]"
 msgstr "<Gerät> [<neue Schlüsseldatei>]"
 
-#: src/cryptsetup.c:110
+#: src/cryptsetup.c:93
 msgid "formats a LUKS device"
 msgstr "Formatiert ein LUKS-Gerät"
 
-#: src/cryptsetup.c:111 src/cryptsetup.c:124
+#: src/cryptsetup.c:94 src/cryptsetup.c:107
 msgid "<device> <name> "
 msgstr "<Gerät> <Name> "
 
-#: src/cryptsetup.c:111
+#: src/cryptsetup.c:94
 msgid "open LUKS device as mapping <name>"
 msgstr "LUKS-Gerät als Zuordnung <Name> öffnen"
 
-#: src/cryptsetup.c:112
+#: src/cryptsetup.c:95
 msgid "add key to LUKS device"
 msgstr "Schlüssel zu LUKS-Gerät hinzufügen"
 
-#: src/cryptsetup.c:113 src/cryptsetup.c:114
+#: src/cryptsetup.c:96 src/cryptsetup.c:97
 msgid "<device> [<key file>]"
 msgstr "<Gerät> [<Schlüsseldatei>]"
 
-#: src/cryptsetup.c:113
+#: src/cryptsetup.c:96
 msgid "removes supplied key or key file from LUKS device"
 msgstr "Entfernt bereitgestellten Schlüssel oder Schlüsseldatei vom LUKS-Gerät"
 
-#: src/cryptsetup.c:114
+#: src/cryptsetup.c:97
 msgid "changes supplied key or key file of LUKS device"
 msgstr "Ändert den angegebenen Schlüssel oder die Schlüsseldatei des LUKS-Geräts"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "<device> <key slot>"
 msgstr "<Gerät> <Schlüsselfach>"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "wipes key with number <key slot> from LUKS device"
 msgstr "Löscht Schlüssel mit Nummer <Schlüsselfach> vom LUKS-Gerät"
 
-#: src/cryptsetup.c:116
+#: src/cryptsetup.c:99
 msgid "print UUID of LUKS device"
 msgstr "UUID des LUKS-Geräts ausgeben"
 
-#: src/cryptsetup.c:117
+#: src/cryptsetup.c:100
 msgid "tests <device> for LUKS partition header"
 msgstr "Testet <Gerät> auf Kopfbereich einer LUKS-Partition"
 
-#: src/cryptsetup.c:118
+#: src/cryptsetup.c:101
 msgid "remove LUKS mapping"
 msgstr "LUKS-Zuordnung entfernen"
 
-#: src/cryptsetup.c:119
+#: src/cryptsetup.c:102
 msgid "dump LUKS partition information"
 msgstr "LUKS-Partitionsinformationen ausgeben"
 
-#: src/cryptsetup.c:120
+#: src/cryptsetup.c:103
 msgid "Suspend LUKS device and wipe key (all IOs are frozen)."
 msgstr "LUKS-Gerät ausschalten und alle Schlüssel auslöschen (alle IOs werden eingefroren)."
 
-#: src/cryptsetup.c:121
+#: src/cryptsetup.c:104
 msgid "Resume suspended LUKS device."
 msgstr "Ausgeschaltetes LUKS-Gerät wiederanschalten."
 
-#: src/cryptsetup.c:122
+#: src/cryptsetup.c:105
 msgid "Backup LUKS device header and keyslots"
 msgstr "Sichern des Kopfbereichs und der Schlüsselfächer eines LUKS-Geräts"
 
-#: src/cryptsetup.c:123
+#: src/cryptsetup.c:106
 msgid "Restore LUKS device header and keyslots"
 msgstr "Wiederherstellen des Kopfbereichs und der Schlüsselfächer eines LUKS-Geräts"
 
-#: src/cryptsetup.c:124
+#: src/cryptsetup.c:107
 msgid "open loop-AES device as mapping <name>"
 msgstr "Loop-AES-Gerät als Zuordnung <Name> öffnen"
 
-#: src/cryptsetup.c:125
+#: src/cryptsetup.c:108
 msgid "remove loop-AES mapping"
 msgstr "Loop-AES-Zuordnung entfernen"
 
-#: src/cryptsetup.c:218
+#: src/cryptsetup.c:123
 msgid "Can't do passphrase verification on non-tty inputs.\n"
 msgstr "Kann die Passsatz-Verifikation nur auf Terminal-Eingaben durchführen.\n"
 
-#: src/cryptsetup.c:233
-msgid "Command successful.\n"
-msgstr "Befehl erfolgreich.\n"
-
-#: src/cryptsetup.c:247
-#, c-format
-msgid "Command failed with code %i"
-msgstr "Befehl fehlgeschlagen mit Code %i"
-
-#: src/cryptsetup.c:375
+#: src/cryptsetup.c:226
 msgid "Option --key-file is required.\n"
 msgstr "Die Option --key-file wird benötigt.\n"
 
-#: src/cryptsetup.c:539
+#: src/cryptsetup.c:392
 msgid "Really try to repair LUKS device header?"
 msgstr "Wirklich versuchen, den LUKS-Geräteheader wiederherzustellen?"
 
-#: src/cryptsetup.c:564
+#: src/cryptsetup.c:417
 #, c-format
 msgid "This will overwrite data on %s irrevocably."
 msgstr "Hiermit überschreiben Sie Daten auf %s unwiderruflich."
 
-#: src/cryptsetup.c:566
+#: src/cryptsetup.c:419
 msgid "memory allocation error in action_luksFormat"
 msgstr "Speicherproblem in action_luksFormat"
 
-#: src/cryptsetup.c:578
+#: src/cryptsetup.c:431 src/cryptsetup_reencrypt.c:522
+#: src/cryptsetup_reencrypt.c:557
 msgid "No known cipher specification pattern detected.\n"
 msgstr "Kein bekanntes Verschlüsselungsmuster entdeckt.\n"
 
-#: src/cryptsetup.c:584
+#: src/cryptsetup.c:437
 #, c-format
 msgid "Cannot use %s as on-disk header.\n"
 msgstr "Kann »%s« nicht als Auf-Platte-Kopfbereich nutzen.\n"
 
-#: src/cryptsetup.c:599 src/cryptsetup.c:1030
+#: src/cryptsetup.c:452 src/cryptsetup.c:885
 msgid "Enter LUKS passphrase: "
 msgstr "LUKS-Passsatz eingeben: "
 
-#: src/cryptsetup.c:654
+#: src/cryptsetup.c:509
 msgid "Reduced data offset is allowed only for detached LUKS header.\n"
 msgstr "Verringerter Datenoffset ist nur für abgetrennten LUKS-Kopfbereich erlaubt.\n"
 
-#: src/cryptsetup.c:755 src/cryptsetup.c:810
+#: src/cryptsetup.c:610 src/cryptsetup.c:665
 #, c-format
 msgid "Key slot %d selected for deletion.\n"
 msgstr "Schlüsselfach %d zum Löschen ausgewählt.\n"
 
-#: src/cryptsetup.c:758
+#: src/cryptsetup.c:613
 #, c-format
 msgid "Key %d not active. Can't wipe.\n"
 msgstr "Schlüssel %d nicht aktiv. Kann nicht auslöschen.\n"
 
-#: src/cryptsetup.c:766 src/cryptsetup.c:813
+#: src/cryptsetup.c:621 src/cryptsetup.c:668
 msgid "This is the last keyslot. Device will become unusable after purging this key."
 msgstr "Dies ist das letzte Schlüsselfach. Wenn Sie das auch noch löschen, wird das Gerät unbrauchbar."
 
-#: src/cryptsetup.c:767
+#: src/cryptsetup.c:622
 msgid "Enter any remaining LUKS passphrase: "
 msgstr "Geben Sie einen eventuell weiteren LUKS-Passsatz ein: "
 
-#: src/cryptsetup.c:795
+#: src/cryptsetup.c:650
 msgid "Enter LUKS passphrase to be deleted: "
 msgstr "Geben Sie den zu löschenden LUKS-Passsatz ein: "
 
-#: src/cryptsetup.c:898
+#: src/cryptsetup.c:753
 msgid "Enter LUKS passphrase to be changed: "
 msgstr "Geben Sie den zu ändernden LUKS-Passsatz ein: "
 
-#: src/cryptsetup.c:935
+#: src/cryptsetup.c:790 src/cryptsetup_reencrypt.c:970
 msgid "Enter new LUKS passphrase: "
 msgstr "Geben Sie den neuen LUKS-Passsatz ein: "
 
-#: src/cryptsetup.c:949
+#: src/cryptsetup.c:804
 #, c-format
 msgid "Key slot %d changed.\n"
 msgstr "Schlüsselfach %d geändert.\n"
 
-#: src/cryptsetup.c:955
+#: src/cryptsetup.c:810
 #, c-format
 msgid "Replaced with key slot %d.\n"
 msgstr "Ersetzt durch Schlüssel-Einschub %d.\n"
 
-#: src/cryptsetup.c:960
+#: src/cryptsetup.c:815
 msgid "Failed to swap new key slot.\n"
 msgstr "Konnte neues Schlüsselfach nicht auswechseln.\n"
 
-#: src/cryptsetup.c:1019
+#: src/cryptsetup.c:874
 msgid ""
 "LUKS header dump with volume key is sensitive information\n"
 "which allows access to encrypted partition without passphrase.\n"
@@ -817,11 +899,11 @@ msgstr ""
 "daher ausschließlich an einem sicheren Ort und verschlüsselt\n"
 "aufbewahrt werden."
 
-#: src/cryptsetup.c:1124 src/cryptsetup.c:1145
+#: src/cryptsetup.c:979 src/cryptsetup.c:1000
 msgid "Option --header-backup-file is required.\n"
 msgstr "Option --header-backup-file wird benötigt.\n"
 
-#: src/cryptsetup.c:1183
+#: src/cryptsetup.c:1027 src/veritysetup.c:328
 msgid ""
 "\n"
 "<action> is one of:\n"
@@ -829,7 +911,7 @@ msgstr ""
 "\n"
 "<Aktion> ist eine von:\n"
 
-#: src/cryptsetup.c:1189
+#: src/cryptsetup.c:1033
 #, c-format
 msgid ""
 "\n"
@@ -844,7 +926,7 @@ msgstr ""
 "<Schlüsselfach> ist die Nummer des zu verändernden LUKS-Schlüsselfachs\n"
 "<Schlüsseldatei> optionale Schlüsseldatei für für den neuen Schlüssel der »luksAddKey«-Aktion\n"
 
-#: src/cryptsetup.c:1196
+#: src/cryptsetup.c:1040
 #, c-format
 msgid ""
 "\n"
@@ -855,7 +937,7 @@ msgstr ""
 "Vorgabewerte für Schlüsseldatei:\n"
 "\tMaximale Größe der Schlüsseldatei: %dkB, Maximale Länge des interaktiven Passsatzes: %d Zeichen\n"
 
-#: src/cryptsetup.c:1201
+#: src/cryptsetup.c:1045
 #, c-format
 msgid ""
 "\n"
@@ -870,190 +952,197 @@ msgstr ""
 "\tplain: %s, Schlüssel: %d Bits, Passsatz-Hashen: %s\n"
 "\tLUKS1: %s, Schlüssel: %d Bits, LUKS-Kopfbereich-Hashen: %s, Zufallszahlengenerator: %s\n"
 
-#: src/cryptsetup.c:1269
+#: src/cryptsetup.c:1085 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1135
 msgid "Show this help message"
 msgstr "Diese Hilfe anzeigen"
 
-#: src/cryptsetup.c:1270
+#: src/cryptsetup.c:1086 src/veritysetup.c:369 src/cryptsetup_reencrypt.c:1136
 msgid "Display brief usage"
 msgstr "Kurze Aufrufsyntax anzeigen"
 
-#: src/cryptsetup.c:1274
+#: src/cryptsetup.c:1090 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1140
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: src/cryptsetup.c:1275
+#: src/cryptsetup.c:1091 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1141
 msgid "Print package version"
 msgstr "Paketversion ausgeben"
 
-#: src/cryptsetup.c:1276
+#: src/cryptsetup.c:1092 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1142
 msgid "Shows more detailed error messages"
 msgstr "Zeigt detailliertere Fehlermeldungen an"
 
-#: src/cryptsetup.c:1277
+#: src/cryptsetup.c:1093 src/veritysetup.c:376 src/cryptsetup_reencrypt.c:1143
 msgid "Show debug messages"
 msgstr "Zeigt Debugging-Meldungen an"
 
-#: src/cryptsetup.c:1278
+#: src/cryptsetup.c:1094 src/cryptsetup_reencrypt.c:1145
 msgid "The cipher used to encrypt the disk (see /proc/crypto)"
 msgstr "Der Algorithmus zum Verschlüsseln der Platte (siehe /proc/crypto)"
 
-#: src/cryptsetup.c:1279
+#: src/cryptsetup.c:1095 src/cryptsetup_reencrypt.c:1147
 msgid "The hash used to create the encryption key from the passphrase"
 msgstr "Das Hashverfahren, um den Verschlüsselungsschlüssel aus dem Passsatz zu erzeugen"
 
-#: src/cryptsetup.c:1280
+#: src/cryptsetup.c:1096
 msgid "Verifies the passphrase by asking for it twice"
 msgstr "Verifiziert den Passsatz durch doppeltes Nachfragen"
 
-#: src/cryptsetup.c:1281
+#: src/cryptsetup.c:1097 src/cryptsetup_reencrypt.c:1148
 msgid "Read the key from a file."
 msgstr "Schlüssel aus einer Datei lesen."
 
-#: src/cryptsetup.c:1282
+#: src/cryptsetup.c:1098
 msgid "Read the volume (master) key from file."
 msgstr "Laufwerks-(Master-)Schlüssel aus Datei lesen."
 
-#: src/cryptsetup.c:1283
+#: src/cryptsetup.c:1099
 msgid "Dump volume (master) key instead of keyslots info."
 msgstr "Laufwerksschlüssel (Master) anstelle der Schlüsselfach-Informationen wegschreiben."
 
-#: src/cryptsetup.c:1284
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "The size of the encryption key"
 msgstr "Die Größe des Verschlüsselungsschlüssels"
 
-#: src/cryptsetup.c:1284
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "BITS"
 msgstr "BITS"
 
-#: src/cryptsetup.c:1285
+#: src/cryptsetup.c:1101 src/cryptsetup_reencrypt.c:1159
 msgid "Limits the read from keyfile"
 msgstr "Begrenzt das Lesen aus der Schlüsseldatei"
 
-#: src/cryptsetup.c:1285 src/cryptsetup.c:1286 src/cryptsetup.c:1287
-#: src/cryptsetup.c:1288
+#: src/cryptsetup.c:1101 src/cryptsetup.c:1102 src/cryptsetup.c:1103
+#: src/cryptsetup.c:1104 src/veritysetup.c:379 src/veritysetup.c:380
+#: src/veritysetup.c:382 src/cryptsetup_reencrypt.c:1158
+#: src/cryptsetup_reencrypt.c:1159 src/cryptsetup_reencrypt.c:1160
+#: src/cryptsetup_reencrypt.c:1161
 msgid "bytes"
 msgstr "Bytes"
 
-#: src/cryptsetup.c:1286
+#: src/cryptsetup.c:1102 src/cryptsetup_reencrypt.c:1158
 msgid "Number of bytes to skip in keyfile"
 msgstr "Anzahl der Bytes, die in der Schlüsseldatei übersprungen werden"
 
-#: src/cryptsetup.c:1287
+#: src/cryptsetup.c:1103
 msgid "Limits the read from newly added keyfile"
 msgstr "Begrenzt das Lesen aus der neu erzeugten Schlüsseldatei"
 
-#: src/cryptsetup.c:1288
+#: src/cryptsetup.c:1104
 msgid "Number of bytes to skip in newly added keyfile"
 msgstr "Anzahl der Bytes, die in der neu erzeugten Schlüsseldatei übersprungen werden"
 
-#: src/cryptsetup.c:1289
+#: src/cryptsetup.c:1105
 msgid "Slot number for new key (default is first free)"
 msgstr "Fachnummer für den neuen Schlüssel (im Zweifel das nächste leere)"
 
-#: src/cryptsetup.c:1290
+#: src/cryptsetup.c:1106
 msgid "The size of the device"
 msgstr "Die Größe des Geräts"
 
-#: src/cryptsetup.c:1290 src/cryptsetup.c:1291 src/cryptsetup.c:1292
-#: src/cryptsetup.c:1298
+#: src/cryptsetup.c:1106 src/cryptsetup.c:1107 src/cryptsetup.c:1108
+#: src/cryptsetup.c:1114
 msgid "SECTORS"
 msgstr "SEKTOREN"
 
-#: src/cryptsetup.c:1291
+#: src/cryptsetup.c:1107
 msgid "The start offset in the backend device"
 msgstr "Der Startabstand im Backend-Gerät"
 
-#: src/cryptsetup.c:1292
+#: src/cryptsetup.c:1108
 msgid "How many sectors of the encrypted data to skip at the beginning"
 msgstr "Wieviele Sektoren der verschlüsselten Daten am Anfang übersprungen werden sollen"
 
-#: src/cryptsetup.c:1293
+#: src/cryptsetup.c:1109
 msgid "Create a readonly mapping"
 msgstr "Eine schreibgeschützte Zuordnung erzeugen"
 
-#: src/cryptsetup.c:1294
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "PBKDF2 iteration time for LUKS (in ms)"
 msgstr "PBKDF2 Iterationszeit for LUKS (in ms)"
 
-#: src/cryptsetup.c:1294
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "msecs"
 msgstr "msek"
 
-#: src/cryptsetup.c:1295
+#: src/cryptsetup.c:1111 src/cryptsetup_reencrypt.c:1150
 msgid "Do not ask for confirmation"
 msgstr "Nicht auf Bestätigung warten"
 
-#: src/cryptsetup.c:1296
+#: src/cryptsetup.c:1112
 msgid "Timeout for interactive passphrase prompt (in seconds)"
 msgstr "Frist für interaktive Eingabe des Passsatzes (in Sekunden)"
 
-#: src/cryptsetup.c:1296
+#: src/cryptsetup.c:1112
 msgid "secs"
 msgstr "sek"
 
-#: src/cryptsetup.c:1297
+#: src/cryptsetup.c:1113 src/cryptsetup_reencrypt.c:1151
 msgid "How often the input of the passphrase can be retried"
 msgstr "Wie oft die Eingabe des Passsatzes wiederholt werden kann"
 
-#: src/cryptsetup.c:1298
+#: src/cryptsetup.c:1114
 msgid "Align payload at <n> sector boundaries - for luksFormat"
 msgstr "Nutzdaten an Grenzen von <n> Sektoren ausrichten - für luksFormat"
 
-#: src/cryptsetup.c:1299
+#: src/cryptsetup.c:1115
 msgid "File with LUKS header and keyslots backup."
 msgstr "Datei mit der Sicherung der LUKS-Kopfdateien und den Schlüsselfächern."
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1116 src/cryptsetup_reencrypt.c:1152
 msgid "Use /dev/random for generating volume key."
 msgstr "/dev/random zum Generieren des Laufwerksschlüssels benutzen."
 
-#: src/cryptsetup.c:1301
+#: src/cryptsetup.c:1117 src/cryptsetup_reencrypt.c:1153
 msgid "Use /dev/urandom for generating volume key."
 msgstr "/dev/urandom zum Generieren des Laufwerksschlüssels benutzen."
 
-#: src/cryptsetup.c:1302
+#: src/cryptsetup.c:1118
 msgid "Share device with another non-overlapping crypt segment."
 msgstr "Gerät mit einem anderen nicht-überlappenden Kryptosegment teilen."
 
-#: src/cryptsetup.c:1303
+#: src/cryptsetup.c:1119 src/veritysetup.c:385
 msgid "UUID for device to use."
 msgstr "UUID für das zu verwendende Gerät."
 
-#: src/cryptsetup.c:1304
+#: src/cryptsetup.c:1120
 msgid "Allow discards (aka TRIM) requests for device."
 msgstr "TRIM-Befehle für das Gerät zulassen."
 
-#: src/cryptsetup.c:1305
+#: src/cryptsetup.c:1121
 msgid "Device or file with separated LUKS header."
 msgstr "Gerät oder Datei mit separatem LUKS-Kopfbereich."
 
-#: src/cryptsetup.c:1324
-msgid "[OPTION...] <action> <action-specific>]"
-msgstr "[OPTION...] <Aktion> <aktionsabhängig>]"
+#: src/cryptsetup.c:1122
+msgid "Do not activate device, just check passphrase."
+msgstr "Gerät nicht aktivieren, nur Passsatz überprüfen."
 
-#: src/cryptsetup.c:1364
+#: src/cryptsetup.c:1140 src/veritysetup.c:402
+msgid "[OPTION...] <action> <action-specific>"
+msgstr "[OPTION...] <Aktion> <aktionsabhängig>"
+
+#: src/cryptsetup.c:1180 src/veritysetup.c:439
 msgid "Argument <action> missing."
 msgstr "Argument <Aktion> fehlt."
 
-#: src/cryptsetup.c:1370
+#: src/cryptsetup.c:1186 src/veritysetup.c:445
 msgid "Unknown action."
 msgstr "Unbekannte Aktion."
 
-#: src/cryptsetup.c:1385
+#: src/cryptsetup.c:1201 src/veritysetup.c:460
 #, c-format
 msgid "%s: requires %s as arguments"
 msgstr "%s: Benötigt %s als Argumente"
 
-#: src/cryptsetup.c:1394
+#: src/cryptsetup.c:1210
 msgid "Option --shared is allowed only for create operation.\n"
 msgstr "Die Option --shared wird nur für »create« unterstützt.\n"
 
-#: src/cryptsetup.c:1403
+#: src/cryptsetup.c:1218
 msgid "Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"
 msgstr "Die Option --allow-discards wird nur für »luksOpen«, »poolaesOpen« und »create« unterstützt.\n"
 
-#: src/cryptsetup.c:1412
+#: src/cryptsetup.c:1226
 msgid ""
 "Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n"
 "To limit read from keyfile use --keyfile-size=(bytes)."
@@ -1061,46 +1150,415 @@ msgstr ""
 "Die Option --key-size ist nur für luksFormat, create and loopaesOpen erlaubt.\n"
 "Benutzen Sie stattdessen --keyfile-size=(Bytes), um das Lesen aus der Schlüsseldatei zu begrenzen."
 
-#: src/cryptsetup.c:1419
+#: src/cryptsetup.c:1233
+msgid "Option --test-passphrase is allowed only for luksOpen.\n"
+msgstr "Die Option --test-passphrase ist nur für luksOpen erlaubt.\n"
+
+#: src/cryptsetup.c:1238 src/cryptsetup_reencrypt.c:1221
 msgid "Key size must be a multiple of 8 bits"
 msgstr "Schlüsselgröße muss ein Vielfaches von 8 Bit sein"
 
-#: src/cryptsetup.c:1426
+#: src/cryptsetup.c:1245 src/cryptsetup_reencrypt.c:1226
 msgid "Key slot is invalid."
 msgstr "Schlüsselfach ist ungültig."
 
-#: src/cryptsetup.c:1433
+#: src/cryptsetup.c:1252
 msgid "Option --key-file takes precedence over specified key file argument.\n"
 msgstr "Die Option --key-file wirkt stärker als das angegebene Schlüsseldatei-Argument.\n"
 
-#: src/cryptsetup.c:1441
+#: src/cryptsetup.c:1260 src/veritysetup.c:467 src/cryptsetup_reencrypt.c:1210
 msgid "Negative number for option not permitted."
 msgstr "Negative Zahl für die Option nicht erlaubt."
 
-#: src/cryptsetup.c:1446
+#: src/cryptsetup.c:1264 src/cryptsetup_reencrypt.c:1204
+#: src/cryptsetup_reencrypt.c:1230
 msgid "Only one of --use-[u]random options is allowed."
 msgstr "Nur eine von --use-[u]random ist erlaubt."
 
-#: src/cryptsetup.c:1450
+#: src/cryptsetup.c:1268
 msgid "Option --use-[u]random is allowed only for luksFormat."
 msgstr "Die Option --use-[u]random ist nur für luksFormat erlaubt."
 
-#: src/cryptsetup.c:1454
+#: src/cryptsetup.c:1272
 msgid "Option --uuid is allowed only for luksFormat and luksUUID."
 msgstr "Die Option --uuid ist nur für luksFormat und luksUUID erlaubt."
 
-#: src/cryptsetup.c:1458
+#: src/cryptsetup.c:1276
 msgid "Option --align-payload is allowed only for luksFormat."
 msgstr "Die Option --align-payload ist nur für luksFormat erlaubt."
 
-#: src/cryptsetup.c:1463
+#: src/cryptsetup.c:1281
 msgid "Option --skip is supported only for create and loopaesOpen commands.\n"
 msgstr "Die Option --skip wird nur für »create« und »loopaesOpen« unterstützt.\n"
 
-#: src/cryptsetup.c:1468
+#: src/cryptsetup.c:1286
 msgid "Option --offset is supported only for create and loopaesOpen commands.\n"
 msgstr "Die Option --offset wird nur für create und loopaesOpen unterstützt.\n"
 
+#: src/veritysetup.c:56
+msgid "Invalid salt string specified.\n"
+msgstr "Ungültiger Salt-String angegeben.\n"
+
+#: src/veritysetup.c:89
+#, c-format
+msgid "Cannot create hash image %s for writing.\n"
+msgstr "Kann Hash-Abbild »%s« nicht zum Schreiben anlegen.\n"
+
+#: src/veritysetup.c:148
+msgid "Invalid root hash string specified.\n"
+msgstr "Ungültiger Root-Hash-String angegeben.\n"
+
+#: src/veritysetup.c:308
+msgid "<data_device> <hash_device>"
+msgstr "<Datengerät> <Hash-Gerät>"
+
+#: src/veritysetup.c:308
+msgid "format device"
+msgstr "Gerät formatieren"
+
+#: src/veritysetup.c:309
+msgid "<data_device> <hash_device> <root_hash>"
+msgstr "<Datengerät> <Hash-Gerät> <Root-Hash>"
+
+#: src/veritysetup.c:309
+msgid "verify device"
+msgstr "Gerät verifizieren"
+
+#: src/veritysetup.c:310
+msgid "<name> <data_device> <hash_device> <root_hash>"
+msgstr "<Name> <Datengerät> <Hash-Gerät> <Root-Hash>"
+
+#: src/veritysetup.c:310
+msgid "create active device"
+msgstr "Aktives Gerät anlegen"
+
+#: src/veritysetup.c:311
+msgid "remove (deactivate) device"
+msgstr "Gerät entfernen (deaktivieren)"
+
+#: src/veritysetup.c:312
+msgid "show active device status"
+msgstr "Status der aktiven Geräte anzeigen"
+
+#: src/veritysetup.c:313
+msgid "<hash_device>"
+msgstr "<Hash-Gerät>"
+
+#: src/veritysetup.c:313
+msgid "show on-disk information"
+msgstr "Daten auf der Platte anzeigen"
+
+#: src/veritysetup.c:332
+#, c-format
+msgid ""
+"\n"
+"<name> is the device to create under %s\n"
+"<data_device> is the data device\n"
+"<hash_device> is the device containing verification data\n"
+"<root_hash> hash of the root node on <hash_device>\n"
+msgstr ""
+"\n"
+"<Name> ist das Gerät, das unter »%s« angelegt werden soll\n"
+"<Datengerät> ist das Datengerät\n"
+"<Hash-Gerät> ist das Gerät, das die Verifikationsdaten enthält\n"
+"<Root-Hash> ist der Hash des Rootknotens auf <Hash-Gerät>\n"
+
+#: src/veritysetup.c:339
+#, c-format
+msgid ""
+"\n"
+"Default compiled-in dm-verity parameters:\n"
+"\tHash: %s, Data block (bytes): %u, Hash block (bytes): %u, Salt size: %u, Hash format: %u\n"
+msgstr ""
+"\n"
+"Eincompilierte Vorgabewerte für dm-verity:\n"
+"\tHash: %s, Datenblock (Bytes): %u, Hashblock (Bytes): %u, Salt-Größe: %u, Hashformat: %u\n"
+
+#: src/veritysetup.c:377
+msgid "Do not use verity superblock"
+msgstr "Verity-Superblock nicht benutzen"
+
+#: src/veritysetup.c:378
+msgid "Format type (1 - normal, 0 - original Chrome OS)"
+msgstr "Format-Art (1 - normal, 0 - originales Chrome-OS)"
+
+#: src/veritysetup.c:378
+msgid "number"
+msgstr "Zahl"
+
+#: src/veritysetup.c:379
+msgid "Block size on the data device"
+msgstr "Blockgröße auf dem Datengerät"
+
+#: src/veritysetup.c:380
+msgid "Block size on the hash device"
+msgstr "Blockgröße auf dem Hash-Gerät"
+
+#: src/veritysetup.c:381
+msgid "The number of blocks in the data file"
+msgstr "Die Anzahl der Blöcke in der Datendatei"
+
+#: src/veritysetup.c:381
+msgid "blocks"
+msgstr "Blöcke"
+
+#: src/veritysetup.c:382
+msgid "Starting offset on the hash device"
+msgstr "Start-Offset auf dem Hash-Gerät"
+
+#: src/veritysetup.c:383
+msgid "Hash algorithm"
+msgstr "Hash-Algorithmus"
+
+#: src/veritysetup.c:383
+msgid "string"
+msgstr "Zeichenkette"
+
+#: src/veritysetup.c:384
+msgid "Salt"
+msgstr "Salt"
+
+#: src/veritysetup.c:384
+msgid "hex string"
+msgstr "Hex-Zeichenkette"
+
+#: src/cryptsetup_reencrypt.c:164
+#, c-format
+msgid "Cannot exclusively open %s, device in use.\n"
+msgstr "Kann Gerät %s nicht exklusiv öffnen, es wird bereits benutzt.\n"
+
+#: src/cryptsetup_reencrypt.c:168
+#, c-format
+msgid "Cannot open device %s\n"
+msgstr "Kann Gerät %s nicht öffnen\n"
+
+#: src/cryptsetup_reencrypt.c:178 src/cryptsetup_reencrypt.c:406
+#: src/cryptsetup_reencrypt.c:822
+msgid "Allocation of aligned memory failed.\n"
+msgstr "Belegen des ausgerichteten Speichers fehlgeschlagen.\n"
+
+#: src/cryptsetup_reencrypt.c:185
+#, c-format
+msgid "Cannot read device %s.\n"
+msgstr "Kann nicht von Gerät %s lesen.\n"
+
+#: src/cryptsetup_reencrypt.c:196
+#, c-format
+msgid "Marking LUKS device %s unusable.\n"
+msgstr "Markiere LUKS-Gerät »%s« als unbenutzbar.\n"
+
+#: src/cryptsetup_reencrypt.c:201
+#, c-format
+msgid "Marking LUKS device %s usable.\n"
+msgstr "Markiere LUKS-Gerät »%s« als benutzbar.\n"
+
+#: src/cryptsetup_reencrypt.c:217
+#, c-format
+msgid "Cannot write device %s.\n"
+msgstr "Kann Gerät %s nicht beschreiben.\n"
+
+#: src/cryptsetup_reencrypt.c:298
+msgid "Cannot write reencryption log file.\n"
+msgstr "Kann Wiederverschlüsselungs-Logdatei nicht wegschreiben.\n"
+
+#: src/cryptsetup_reencrypt.c:347
+msgid "Cannot read reencryption log file.\n"
+msgstr "Kann Wiederverschlüsselungs-Logdatei nicht einlesen.\n"
+
+#: src/cryptsetup_reencrypt.c:397
+#, c-format
+msgid "Log file %s exists, resuming reencryption.\n"
+msgstr "Logdatei »%s« existiert, nehme Wiederverschlüsselung wieder auf.\n"
+
+#: src/cryptsetup_reencrypt.c:451
+msgid "Activation of temporary devices failed.\n"
+msgstr "Aktivierung der temporären Geräte fehlgeschlagen.\n"
+
+#: src/cryptsetup_reencrypt.c:476
+#, c-format
+msgid "New LUKS header for device %s created.\n"
+msgstr "Neuer LUKS-Header für Gerät %s angelegt.\n"
+
+#: src/cryptsetup_reencrypt.c:484
+#, c-format
+msgid "Activated keyslot %i.\n"
+msgstr "Schlüsselfach %i aktiviert.\n"
+
+#: src/cryptsetup_reencrypt.c:508
+#, c-format
+msgid "LUKS header backup of device %s created.\n"
+msgstr "LUKS-Backup-Header von Gerät %s angelegt.\n"
+
+#: src/cryptsetup_reencrypt.c:536
+msgid "Creation of LUKS backup headers failed.\n"
+msgstr "Anlegen der LUKS-Backup-Header fehlgeschlagen.\n"
+
+#: src/cryptsetup_reencrypt.c:631
+#, c-format
+msgid "Cannot restore LUKS header on device %s.\n"
+msgstr "Kann den LUKS-Header auf Gerät %s nicht wiederherstellen.\n"
+
+#: src/cryptsetup_reencrypt.c:633
+#, c-format
+msgid "LUKS header on device %s restored.\n"
+msgstr "LUKS-Header auf Gerät %s wiederhergestellt.\n"
+
+#: src/cryptsetup_reencrypt.c:665
+#, c-format
+msgid "Progress: %5.1f%%, ETA %02llu:%02llu, %4llu MiB written, speed %5.1f MiB/s%s"
+msgstr "Fortschritt: %5.1f%%, noch %02llu:%02llu, %4llu MiB geschrieben bei %5.1f MiB/s%s"
+
+#: src/cryptsetup_reencrypt.c:681 src/cryptsetup_reencrypt.c:757
+msgid "Cannot seek to device offset.\n"
+msgstr "Kann nicht zur gewünschten Position springen.\n"
+
+#: src/cryptsetup_reencrypt.c:803 src/cryptsetup_reencrypt.c:809
+msgid "Cannot open temporary LUKS header file.\n"
+msgstr "Kann temporäre LUKS-Header-Datei nicht öffnen.\n"
+
+#: src/cryptsetup_reencrypt.c:815
+msgid "Cannot get device size.\n"
+msgstr "Kann Gerätegröße nicht ermitteln.\n"
+
+#: src/cryptsetup_reencrypt.c:839
+msgid "Interrupted by a signal.\n"
+msgstr "Durch ein Signal unterbrochen.\n"
+
+#: src/cryptsetup_reencrypt.c:841
+msgid "IO error during reencryption.\n"
+msgstr "E/A-Fehler während der Wiederverschlüsselung.\n"
+
+#: src/cryptsetup_reencrypt.c:942
+msgid "Key file can be used only with --key-slot or with exactly one key slot active.\n"
+msgstr "Schlüsseldatei kann nur mit --key-slot oder mit genau einem aktiven Schlüsselfach benutzt werden.\n"
+
+#: src/cryptsetup_reencrypt.c:984
+msgid "Enter any LUKS passphrase: "
+msgstr "Geben Sie irgendeinen LUKS-Passsatz ein: "
+
+#: src/cryptsetup_reencrypt.c:991
+#, c-format
+msgid "Enter LUKS passphrase for key slot %u: "
+msgstr "Geben Sie den LUKS-Passsatz für Schlüsselfach %u ein: "
+
+#: src/cryptsetup_reencrypt.c:1040
+msgid "Cannot open reencryption log file.\n"
+msgstr "Kann die Wiederverschlüsselungs-Logdatei nicht öffnen.\n"
+
+#: src/cryptsetup_reencrypt.c:1144
+msgid "Reencryption block size"
+msgstr "Wiederverschlüsselungs-Blockgröße"
+
+#: src/cryptsetup_reencrypt.c:1144
+msgid "MiB"
+msgstr "MiB"
+
+#: src/cryptsetup_reencrypt.c:1154
+msgid "Use direct-io when accesing devices."
+msgstr "Direkte I/O beim Zugriff auf die Geräte benutzen."
+
+#: src/cryptsetup_reencrypt.c:1155
+msgid "Use fsync after each block."
+msgstr "Nach jedem Block fsync aufrufen."
+
+#: src/cryptsetup_reencrypt.c:1156
+msgid "Update log file after every block."
+msgstr "Logdatei nach jedem Block aktualisieren."
+
+#: src/cryptsetup_reencrypt.c:1157
+msgid "Use only this slot (others will be disabled)."
+msgstr "Nur dieses Schlüsselfach benutzen (alle anderen werden deaktiviert)."
+
+#: src/cryptsetup_reencrypt.c:1160
+msgid "Reduce data device size (move data offset). DANGEROUS!"
+msgstr "Größe des Datengeräts reduzieren (Datenoffset verschieben). GEFÄHRLICH!"
+
+#: src/cryptsetup_reencrypt.c:1161
+msgid "Use only specified device size (ignore rest of device). DANGEROUS!"
+msgstr "Nur die angegebene Gerätegröße benutzen (Rest des Gerätes ignorieren). GEFÄHRLICH!"
+
+#: src/cryptsetup_reencrypt.c:1162
+msgid "Create new header on not encrypted device."
+msgstr "Neuen Header auf unverschlüsseltem Gerät anlegen."
+
+#: src/cryptsetup_reencrypt.c:1178
+msgid "[OPTION...] <device>"
+msgstr "[OPTION...] <Gerät>"
+
+#: src/cryptsetup_reencrypt.c:1192
+msgid "WARNING: this is experimental code, it can completely break your data.\n"
+msgstr "WARNUNG: Dies ist experimenteller Code, kann sein, dass er Ihre Daten komplett zerstört.\n"
+
+#: src/cryptsetup_reencrypt.c:1193
+#, c-format
+msgid "Reencryption will change: volume key%s%s%s%s.\n"
+msgstr "Wiederverschlüsselung wird ändern: Laufwerkskennung%s%s%s%s.\n"
+
+#: src/cryptsetup_reencrypt.c:1194
+msgid ", set hash to "
+msgstr ", Hash auf "
+
+#: src/cryptsetup_reencrypt.c:1195
+msgid ", set cipher to "
+msgstr ", Verschlüsselung auf "
+
+#: src/cryptsetup_reencrypt.c:1200
+msgid "Argument required."
+msgstr "Argument erforderlich."
+
+#: src/cryptsetup_reencrypt.c:1216
+msgid "Only values between 1 MiB and 64 MiB allowed for reencryption block size."
+msgstr "Nur Werte zwischen 1 MiB und 64 MiB sind für die Wiederverschlüsselungs-Blockgröße erlaubt."
+
+#: src/cryptsetup_reencrypt.c:1235 src/cryptsetup_reencrypt.c:1240
+msgid "Invalid device size specification."
+msgstr "Ungültige Angabe der Gerätegröße."
+
+#: src/cryptsetup_reencrypt.c:1243
+msgid "Maximum device reduce size is 64 MiB."
+msgstr "Die maximale Verkleinerungsgröße ist 64 MiB."
+
+#: src/cryptsetup_reencrypt.c:1246
+msgid "Reduce size must be multiple of 512 bytes sector."
+msgstr "Die verkleinerte Größe muss ein Vielfaches von 512-Byte-Sektoren sein."
+
+#: src/cryptsetup_reencrypt.c:1250
+msgid "Option --new must be used together with --reduce-device-size."
+msgstr "Die Option --new muss zusammen mit --reduce-device-size benutzt werden."
+
+#: src/utils_tools.c:114
+msgid "Command successful.\n"
+msgstr "Befehl erfolgreich.\n"
+
+#: src/utils_tools.c:128
+#, c-format
+msgid "Command failed with code %i"
+msgstr "Befehl fehlgeschlagen mit Code %i"
+
+#~ msgid "Cannot open device %s for %s%s access.\n"
+#~ msgstr "Kann Gerät %s nicht zum %s%szugriff öffnen.\n"
+
+#~ msgid "exclusive "
+#~ msgstr "exklusiven"
+
+#~ msgid "writable"
+#~ msgstr "Schreib"
+
+#~ msgid "read-only"
+#~ msgstr "Lese"
+
+#~ msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
+#~ msgstr "WARNUNG!!! Möglicherweise unsicherer Speicher. Sind Sie Root?\n"
+
+#~ msgid "Unable to obtain sector size for %s"
+#~ msgstr "Kann Sektorengröße für %s nicht ermitteln."
+
+#~ msgid "Failed to write to key storage.\n"
+#~ msgstr "Schreiben des Schlüsselspeichers fehlgeschlagen.\n"
+
+#~ msgid "Failed to read from key storage.\n"
+#~ msgstr "Lesen des Schlüsselspeichers fehlgeschlagen.\n"
+
 #~ msgid "Device %s is busy.\n"
 #~ msgstr "Gerät %s ist beschäftigt.\n"
 
diff --git a/po/fr.po b/po/fr.po
index eccf430..da00a40 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,485 +1,469 @@
 # Messages français pour cryptsetup.
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is put in the public domain.
+#
 # Solveig <perso@solveig.org>, 2009.
 # Nicolas Provost <nprovost@quadriv.com>, 2011.
-#
+# Frédéric Marchal <fmarchal@perso.be>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: cryptsetup 1.3.0-rc2\n"
+"Project-Id-Version: cryptsetup 1.5.1\n"
 "Report-Msgid-Bugs-To: dm-crypt@saout.de\n"
-"POT-Creation-Date: 2011-03-22 13:25+0100\n"
-"PO-Revision-Date: 2011-05-27 10:06+0100\n"
-"Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
+"POT-Creation-Date: 2012-09-19 15:48+0200\n"
+"PO-Revision-Date: 2012-10-13 17:46+0200\n"
+"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.4\n"
 
-#: lib/libdevmapper.c:181
+#: lib/libdevmapper.c:230
+msgid "Cannot initialize device-mapper, running as non-root user.\n"
+msgstr "Impossible d'initialiser le gestionnaire « device-mapper ». Fonctionne comme un utilisateur non-root.\n"
+
+#: lib/libdevmapper.c:233
 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n"
 msgstr "Impossible d'initialiser le gestionnaire « device-mapper ». Le module noyau dm_mod est-il chargé ?\n"
 
-#: lib/libdevmapper.c:469
+#: lib/libdevmapper.c:516
 #, c-format
 msgid "DM-UUID for device %s was truncated.\n"
 msgstr "Le DM-UUID du périphérique %s a été tronqué.\n"
 
-#: lib/random.c:73
+#: lib/random.c:74
 msgid ""
 "System is out of entropy while generating volume key.\n"
 "Please move mouse or type some text in another window to gather some random events.\n"
 msgstr ""
 "Le système a manqué d'entropie lors de la génération de la clef de volume.\n"
-"SVP remuez la souris ou tapez du texte dans une autre fenêtre pour générer des événements aléatoires.\n"
+"Veuillez remuer la souris ou taper du texte dans une autre fenêtre pour générer des événements aléatoires.\n"
 
-#: lib/random.c:77
+#: lib/random.c:78
 #, c-format
 msgid "Generating key (%d%% done).\n"
 msgstr "Génération de la clef (%d%% effectués).\n"
 
-#: lib/random.c:166
+#: lib/random.c:167
 msgid "Fatal error during RNG initialisation.\n"
 msgstr "Erreur fatale d'initialisation RNG.\n"
 
-#: lib/random.c:193
+#: lib/random.c:204
 msgid "Unknown RNG quality requested.\n"
 msgstr "La qualité du générateur aléatoire RNG demandé est inconnue.\n"
 
-#: lib/random.c:198
+#: lib/random.c:209
 #, c-format
 msgid "Error %d reading from RNG: %s\n"
-msgstr "Erreur %d en lecture du générateur aléatoire RNG : %s\n"
+msgstr "Erreur %d en lecture du générateur aléatoire RNG :%s\n"
 
-#: lib/setup.c:126
+#: lib/setup.c:179
 msgid "Cannot initialize crypto RNG backend.\n"
 msgstr "Impossible d'initialiser le moteur aléatoire RNG pour le chiffrement.\n"
 
-#: lib/setup.c:132
+#: lib/setup.c:185
 msgid "Cannot initialize crypto backend.\n"
 msgstr "Impossible d'initialiser le moteur de chiffrement.\n"
 
-#: lib/setup.c:161
-#, c-format
-msgid "Cannot not read %d bytes from key file %s.\n"
-msgstr "Échec à la lecture de %d octets du fichier %s contenant la clé.\n"
-
-#: lib/setup.c:175
+#: lib/setup.c:208 lib/setup.c:1060 lib/verity/verity.c:120
 #, c-format
 msgid "Hash algorithm %s not supported.\n"
 msgstr "L'algorithme de hachage %s n'est pas supporté.\n"
 
-#: lib/setup.c:178
+#: lib/setup.c:211 lib/loopaes/loopaes.c:88
 #, c-format
 msgid "Key processing error (using hash %s).\n"
 msgstr "Erreur de traitement de clé (valeur hachage %s).\n"
 
-#: lib/setup.c:213
+#: lib/setup.c:252
 msgid "All key slots full.\n"
 msgstr "Tous les emplacements de clés sont utilisés.\n"
 
-#: lib/setup.c:220 lib/setup.c:315 lib/setup.c:782
+#: lib/setup.c:259
 #, c-format
 msgid "Key slot %d is invalid, please select between 0 and %d.\n"
 msgstr "L'emplacement de clé %d n'est pas valide, merci d'en choisir un entre 0 et %d.\n"
 
-#: lib/setup.c:226
+#: lib/setup.c:265
 #, c-format
 msgid "Key slot %d is full, please select another one.\n"
 msgstr "L'emplacement de clé %d est utilisé, merci d'en sélectionner un autre.\n"
 
-#: lib/setup.c:244 src/cryptsetup.c:600
-msgid "Enter any remaining LUKS passphrase: "
-msgstr "Entrez une phrase secrète LUKS valide :"
-
-#: lib/setup.c:264
-#, c-format
-msgid "Key slot %d verified.\n"
-msgstr "L'emplacement de clé %d a été vérifié.\n"
-
-#: lib/setup.c:304 src/cryptsetup.c:628
-msgid "Enter LUKS passphrase to be deleted: "
-msgstr "Entrez la phrase secrète LUKS à effacer :"
-
-#: lib/setup.c:310 src/cryptsetup.c:589 src/cryptsetup.c:643
-#, c-format
-msgid "Key slot %d selected for deletion.\n"
-msgstr "Emplacement de clé %d sélectionné pour suppression.\n"
-
-#: lib/setup.c:321 src/cryptsetup.c:592
-#, c-format
-msgid "Key %d not active. Can't wipe.\n"
-msgstr "La clé %d n'est pas active. Impossible de l'effacer.\n"
-
-#: lib/setup.c:327 src/cryptsetup.c:599 src/cryptsetup.c:646
-msgid "This is the last keyslot. Device will become unusable after purging this key."
-msgstr "Ceci est le dernier emplacement de clé. Le périphérique sera inutilisable après la suppression de cette clé."
-
-#: lib/setup.c:378 lib/setup.c:1914 lib/setup.c:1981 lib/setup.c:2076
-#, c-format
-msgid "Device %s already exists.\n"
-msgstr "Le périphérique %s existe déjà.\n"
-
-#: lib/setup.c:383
-#, c-format
-msgid "Invalid key size %d.\n"
-msgstr "%d n'est pas une taille de clé valide.\n"
-
-#: lib/setup.c:465
+#: lib/setup.c:379
 #, c-format
 msgid "Enter passphrase for %s: "
 msgstr "Saisissez la phrase secrète pour %s : "
 
-#: lib/setup.c:623 lib/setup.c:1646 lib/setup.c:1990 lib/setup.c:2002
-#: src/cryptsetup.c:268
-msgid "Enter passphrase: "
-msgstr "Saisissez la phrase secrète : "
+#: lib/setup.c:560
+#, c-format
+msgid "Header detected but device %s is too small.\n"
+msgstr "En-tête détecté mais le périphérique %s est trop petit.\n"
+
+#: lib/setup.c:576 lib/setup.c:1278
+msgid "This operation is not supported for this device type.\n"
+msgstr "Cette opération n'est pas supportée pour ce type de périphérique.\n"
 
-#: lib/setup.c:666 lib/setup.c:1088 lib/setup.c:1406 lib/setup.c:2128
+#: lib/setup.c:782 lib/setup.c:1242 lib/setup.c:2034
 #, c-format
 msgid "Device %s is not active.\n"
 msgstr "Le périphérique %s n'est pas activé.\n"
 
-#: lib/setup.c:774
-msgid "No known cipher specification pattern detected.\n"
-msgstr "Aucun motif connu d'algorithme de chiffrement n'a été détecté.\n"
-
-#: lib/setup.c:788 src/cryptsetup.c:467 src/cryptsetup.c:859
-msgid "Enter LUKS passphrase: "
-msgstr "Saisissez la phrase secrète LUKS : "
-
-#: lib/setup.c:1020
-msgid "Cannot find a free loopback device.\n"
-msgstr "Impossible de trouver un périphérique boucle \"loopback\" libre.\n"
-
-#: lib/setup.c:1028
-msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
-msgstr "Impossible d'associer le périphérique boucle \"loopback\" (le drapeau \"autoclear\" est requis).\n"
-
-#: lib/setup.c:1103
+#: lib/setup.c:799
 #, c-format
 msgid "Underlying device for crypt device %s disappeared.\n"
 msgstr "Le périphérique sous-jacent pour le périphérique chiffré %s a disparu.\n"
 
-#: lib/setup.c:1195
+#: lib/setup.c:862
 msgid "Invalid plain crypt parameters.\n"
 msgstr "Paramètres de chiffrement non valides.\n"
 
-#: lib/setup.c:1200 lib/setup.c:1297
+#: lib/setup.c:867 lib/setup.c:989
 msgid "Invalid key size.\n"
 msgstr "La taille de la clé n'est pas valide.\n"
 
-#: lib/setup.c:1239
+#: lib/setup.c:911
 msgid "Can't format LUKS without device.\n"
 msgstr "Impossible de formater en LUKS sans périphérique.\n"
 
-#: lib/setup.c:1271
+#: lib/setup.c:959
 #, c-format
 msgid "Cannot format device %s which is still in use.\n"
 msgstr "Impossible de formater le périphérique %s qui est déjà en cours d'utilisation.\n"
 
-#: lib/setup.c:1274
+#: lib/setup.c:962
+#, c-format
+msgid "Cannot format device %s, permission denied.\n"
+msgstr "Impossible de formater le périphérique %s. Permission refusée.\n"
+
+#: lib/setup.c:966
 #, c-format
 msgid "Cannot wipe header on device %s.\n"
-msgstr "Impossible d'effacer l'entête du périphérique %s.\n"
+msgstr "Impossible d'effacer l'en-tête du périphérique %s.\n"
 
-#: lib/setup.c:1292
+#: lib/setup.c:984
 msgid "Can't format LOOPAES without device.\n"
-msgstr "Impossible de formater en boucle \"loopAES\" sans périphérique.\n"
+msgstr "Impossible de formater LOOPAES sans périphérique.\n"
+
+#: lib/setup.c:1020
+msgid "Can't format VERITY without device.\n"
+msgstr "Impossible de formater VERITY sans périphérique.\n"
+
+#: lib/setup.c:1028 lib/verity/verity.c:103
+#, c-format
+msgid "Unsupported VERITY hash type %d.\n"
+msgstr "Type de hachage VERITY %d non supporté.\n"
+
+#: lib/setup.c:1034 lib/verity/verity.c:111
+msgid "Unsupported VERITY block size.\n"
+msgstr "Taille de bloc VERITY non supportée.\n"
+
+#: lib/setup.c:1039 lib/verity/verity.c:74
+msgid "Unsupported VERITY hash offset.\n"
+msgstr "Décalage de hachage VERITY non supporté.\n"
 
-#: lib/setup.c:1346
+#: lib/setup.c:1151
 #, c-format
 msgid "Unknown crypt device type %s requested.\n"
 msgstr "Type de chiffrement de périphérique demandé (%s) inconnu.\n"
 
-#: lib/setup.c:1443
-msgid "This operation is not supported for this device type.\n"
-msgstr "Cette opération n'est pas supportée pour ce type de périphérique.\n"
-
-#: lib/setup.c:1458
+#: lib/setup.c:1293
 msgid "Do you really want to change UUID of device?"
-msgstr "Voulez-vous réellement changer l'UUID du périphérique ?"
+msgstr "Voulez-vous réellement changer l'UUID du périphérique ?"
 
-#: lib/setup.c:1538
+#: lib/setup.c:1379 lib/setup.c:1424 lib/setup.c:1473 lib/setup.c:1539
+#: lib/setup.c:1615 lib/setup.c:1696 lib/setup.c:1742 lib/setup.c:2099
+#: lib/setup.c:2382
+msgid "This operation is supported only for LUKS device.\n"
+msgstr "Cette opération n'est possible que pour les périphériques LUKS.\n"
+
+#: lib/setup.c:1386
 #, c-format
 msgid "Volume %s is not active.\n"
 msgstr "Le volume %s n'est pas actif.\n"
 
-#: lib/setup.c:1551
+#: lib/setup.c:1397
 #, c-format
 msgid "Volume %s is already suspended.\n"
-msgstr "Le volume %s est déjà en hibernation.\n"
-
-#: lib/setup.c:1579 lib/setup.c:1628 lib/setup.c:1684 lib/setup.c:1758
-#: lib/setup.c:1827 lib/setup.c:1873 lib/setup.c:2197 lib/setup.c:2298
-#: lib/setup.c:2422
-msgid "This operation is supported only for LUKS device.\n"
-msgstr "Cette opération n'est possible que pour les périphériques LUKS.\n"
+msgstr "Le volume %s est déjà en suspendu.\n"
 
-#: lib/setup.c:1590 lib/setup.c:1639
+#: lib/setup.c:1434 lib/setup.c:1483
 #, c-format
 msgid "Volume %s is not suspended.\n"
-msgstr "Le volume %s n'est pas en hibernation.\n"
+msgstr "Le volume %s n'est pas suspendu.\n"
 
-#: lib/setup.c:1698 lib/setup.c:1772
+#: lib/setup.c:1490 lib/setup.c:1867 lib/setup.c:1881 src/cryptsetup.c:194
+msgid "Enter passphrase: "
+msgstr "Saisissez la phrase secrète : "
+
+#: lib/setup.c:1553 lib/setup.c:1629
 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n"
 msgstr "Impossible d'ajouter un emplacement de clé, tous les emplacements sont désactivés et aucune clé n'a été fournie pour ce volume.\n"
 
-#: lib/setup.c:1707 lib/setup.c:1778 lib/setup.c:1782
+#: lib/setup.c:1562 lib/setup.c:1635 lib/setup.c:1639
 msgid "Enter any passphrase: "
-msgstr "Entrez une phrase de passe :"
+msgstr "Entrez une phrase de passe : "
 
-#: lib/setup.c:1724 lib/setup.c:1795 lib/setup.c:1799 lib/setup.c:1850
+#: lib/setup.c:1579 lib/setup.c:1652 lib/setup.c:1656 lib/setup.c:1719
 msgid "Enter new passphrase for key slot: "
-msgstr "Entrez une nouvelle phrase secrète pour l'emplacement de clé :"
+msgstr "Entrez une nouvelle phrase secrète pour l'emplacement de clé : "
 
-#: lib/setup.c:1841 lib/setup.c:2084 lib/setup.c:2097 lib/setup.c:2208
+#: lib/setup.c:1710 lib/setup.c:1971 lib/setup.c:1984 lib/setup.c:2110
 msgid "Volume key does not match the volume.\n"
 msgstr "Ceci n'est pas la clé du volume.\n"
 
-#: lib/setup.c:1879
+#: lib/setup.c:1748
 #, c-format
 msgid "Key slot %d is invalid.\n"
 msgstr "L'emplacement de clé %d n'est pas valide.\n"
 
-#: lib/setup.c:1884
+#: lib/setup.c:1753
 #, c-format
 msgid "Key slot %d is not used.\n"
 msgstr "L'emplacement de clé %d n'est pas utilisé.\n"
 
-#: lib/setup.c:2056
+#: lib/setup.c:1783 lib/setup.c:1855 lib/setup.c:1947
+#, c-format
+msgid "Device %s already exists.\n"
+msgstr "Le périphérique %s existe déjà.\n"
+
+#: lib/setup.c:1958
 msgid "Incorrect volume key specified for plain device.\n"
-msgstr "Clef de volume spécifiée depuis l'entrée en \"clair\" incorrecte.\n"
+msgstr "Clé de volume incorrecte pour le périphérique en clair.\n"
 
-#: lib/setup.c:2067
+#: lib/setup.c:1991
+msgid "Incorrect root hash specified for verity device.\n"
+msgstr "Hachage racine incorrect spécifié pour le périphérique verity.\n"
+
+#: lib/setup.c:2009
 msgid "Device type is not properly initialised.\n"
 msgstr "Type de périphérique non proprement initialisé.\n"
 
-#: lib/setup.c:2124
-#, c-format
-msgid "Device %s is busy.\n"
-msgstr "Le périphérique %s est occupé.\n"
-
-#: lib/setup.c:2132
+#: lib/setup.c:2038
 #, c-format
 msgid "Invalid device %s.\n"
 msgstr "Le périphérique %s n'est pas valide.\n"
 
-#: lib/setup.c:2155
+#: lib/setup.c:2066
 msgid "Volume key buffer too small.\n"
 msgstr "Le tampon de la clé du volume est trop petit.\n"
 
-#: lib/setup.c:2163
+#: lib/setup.c:2074
 msgid "Cannot retrieve volume key for plain device.\n"
 msgstr "Impossible de récupérer la clé du volume pour ce périphérique de type « plain ».\n"
 
-#: lib/setup.c:2185
+#: lib/setup.c:2080
 #, c-format
 msgid "This operation is not supported for %s crypt device.\n"
 msgstr "Cette opération n'est pas possible pour le périphérique chiffré %s.\n"
 
-#: lib/utils.c:268
-#, c-format
-msgid "Device %s doesn't exist or access denied.\n"
-msgstr "Le périphérique %s n'existe pas, ou l'accès y est interdit.\n"
+#: lib/setup.c:2275
+msgid "Dump operation is not supported for this device type.\n"
+msgstr "L'opération de vidage n'est pas supportée pour ce type de périphérique.\n"
 
-#: lib/utils.c:278
-#, c-format
-msgid "Cannot open device %s for %s%s access.\n"
-msgstr "Impossible d'ouvrir le périphérique %s pour un accès %s%s.\n"
-
-#: lib/utils.c:279
-msgid "exclusive "
-msgstr "exclusif "
-
-#: lib/utils.c:280
-msgid "writable"
-msgstr "en écriture"
-
-#: lib/utils.c:280
-msgid "read-only"
-msgstr "en lecture seule"
-
-#: lib/utils.c:287
-#, c-format
-msgid "Cannot read device %s.\n"
-msgstr "Impossible de lire le périphérique %s.\n"
-
-#: lib/utils.c:381
-#, c-format
-msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
-msgstr "Impossible d'utiliser le périphérique %s actuellement en usage (déjà mappé ou monté).\n"
-
-#: lib/utils.c:385
-#, c-format
-msgid "Cannot get info about device %s.\n"
-msgstr "Impossible d'obtenir des informations au sujet du périphérique %s.\n"
-
-#: lib/utils.c:393
-#, c-format
-msgid "Device %s has zero size.\n"
-msgstr "Le périphérique %s a une taille nulle.\n"
-
-#: lib/utils.c:397
-#, c-format
-msgid "Device %s is too small.\n"
-msgstr "Le périphérique %s est trop petit.\n"
-
-#: lib/utils.c:458
-msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
-msgstr "ATTENTION !!! La mémoire n'est peut-être pas sécurisée. Êtes-vous super-utilisateur ?\n"
-
-#: lib/utils.c:464
+#: lib/utils.c:238
 msgid "Cannot get process priority.\n"
 msgstr "Impossible d'obtenir la priorité du processus.\n"
 
-#: lib/utils.c:467 lib/utils.c:480
+#: lib/utils.c:241 lib/utils.c:254
 #, c-format
 msgid "setpriority %d failed: %s\n"
-msgstr "la priorité n'a pu être définie à %d avec « setpriority » : %s\n"
+msgstr "setpriority %d a échoué : %s\n"
 
-#: lib/utils.c:478
+#: lib/utils.c:252
 msgid "Cannot unlock memory.\n"
-msgstr "Impossible de débloquer la mémoire.\n"
+msgstr "Impossible de déverrouiller la mémoire.\n"
 
-#: lib/utils_crypt.c:210 lib/utils_crypt.c:223 lib/utils_crypt.c:313
-#: lib/utils_crypt.c:322
+#: lib/utils_crypt.c:225 lib/utils_crypt.c:238 lib/utils_crypt.c:385
+#: lib/utils_crypt.c:400
 msgid "Out of memory while reading passphrase.\n"
 msgstr "Plus assez de mémoire lors de la lecture de la phrase secrète.\n"
 
-#: lib/utils_crypt.c:215 lib/utils_crypt.c:230
+#: lib/utils_crypt.c:230 lib/utils_crypt.c:245
 msgid "Error reading passphrase from terminal.\n"
 msgstr "Erreur de lecture de la phrase secrète depuis la console.\n"
 
-#: lib/utils_crypt.c:228
+#: lib/utils_crypt.c:243
 msgid "Verify passphrase: "
-msgstr "Entrez la phrase secrète pour vérification : "
+msgstr "Vérifiez la phrase secrète : "
 
-#: lib/utils_crypt.c:235
+#: lib/utils_crypt.c:250
 msgid "Passphrases do not match.\n"
 msgstr "Les phrases secrètes ne sont pas identiques.\n"
 
-#: lib/utils_crypt.c:277
-msgid "Negative keyfile size not permitted.\n"
-msgstr "Taille négative de fichier de clé non autorisée.\n"
+#: lib/utils_crypt.c:334
+msgid "Cannot use offset with terminal input.\n"
+msgstr "Le décalage n'est pas possible si l'entrée provient de la console.\n"
 
-#: lib/utils_crypt.c:289
+#: lib/utils_crypt.c:353
 msgid "Failed to open key file.\n"
 msgstr "Impossible d'ouvrir le fichier de clef.\n"
 
-#: lib/utils_crypt.c:298
+#: lib/utils_crypt.c:362
 msgid "Failed to stat key file.\n"
-msgstr "Impossible d'atteindre le fichier de clef.\n"
+msgstr "Impossible d'exécuter « stat » sur le fichier de clef.\n"
 
-#: lib/utils_crypt.c:330
+#: lib/utils_crypt.c:370 lib/utils_crypt.c:391
+msgid "Cannot seek to requested keyfile offset.\n"
+msgstr "Impossible de sauter au décalage demandé dans le fichier de clé.\n"
+
+#: lib/utils_crypt.c:408
 msgid "Error reading passphrase.\n"
 msgstr "Erreur de lecture de la phrase secrète.\n"
 
-#: lib/utils_crypt.c:345
-msgid "Maximum keyfile size exceeeded.\n"
+#: lib/utils_crypt.c:426
+msgid "Maximum keyfile size exceeded.\n"
 msgstr "Taille max. de fichier de clé dépassée.\n"
 
-#: lib/utils_crypt.c:350
+#: lib/utils_crypt.c:431
 msgid "Cannot read requested amount of data.\n"
 msgstr "Impossible de lire la quantité de données demandée.\n"
 
-#: lib/luks1/keyencryption.c:66
+#: lib/utils_fips.c:46
+msgid "FIPS checksum verification failed.\n"
+msgstr "La vérification de la somme de contrôle FIPS a échoué.\n"
+
+#: lib/utils_fips.c:50
+msgid "Running in FIPS mode.\n"
+msgstr "Fonctionne en mode FIPS.\n"
+
+#: lib/utils_device.c:48
 #, c-format
-msgid "Unable to obtain sector size for %s"
-msgstr "Impossible d'obtenir la taille de secteur de %s"
+msgid "Device %s doesn't exist or access denied.\n"
+msgstr "Le périphérique %s n'existe pas ou l'accès y est interdit.\n"
 
-#: lib/luks1/keyencryption.c:106
-msgid "Key size in XTS mode must be 256 or 512 bits.\n"
-msgstr "La taille de la clé en mode XTS doit être un multiple de 256 ou 512 bits.\n"
+#: lib/utils_device.c:58 lib/luks1/keymanage.c:298 lib/luks1/keymanage.c:527
+#: lib/luks1/keymanage.c:567 lib/verity/verity.c:80 lib/verity/verity.c:174
+#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:304
+#: lib/verity/verity_hash.c:324
+#, c-format
+msgid "Cannot open device %s.\n"
+msgstr "Impossible d'ouvrir le périphérique %s.\n"
+
+#: lib/utils_device.c:333
+msgid "Cannot use a loopback device, running as non-root user.\n"
+msgstr "Impossible d'utiliser un périphérique loopback. Fonctionne comme un utilisateur non-root.\n"
 
-#: lib/luks1/keyencryption.c:108
-msgid "Block mode XTS is available since kernel 2.6.24.\n"
-msgstr "Le mode \"bloc\" XTS est disponible depuis le noyau 2.6.24.\n"
+#: lib/utils_device.c:336
+msgid "Cannot find a free loopback device.\n"
+msgstr "Impossible de trouver un périphérique loopback libre.\n"
+
+#: lib/utils_device.c:343
+msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
+msgstr "Impossible d'associer le périphérique loopback (le drapeau « autoclear » est requis).\n"
 
-#: lib/luks1/keyencryption.c:110
-msgid "Key size in LRW mode must be 256 or 512 bits.\n"
-msgstr "La taille de la clé en mode LRW doit être un multiple de 256 ou 512 bits.\n"
+#: lib/utils_device.c:383
+#, c-format
+msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
+msgstr "Impossible d'utiliser le périphérique %s actuellement en usage (déjà mappé ou monté).\n"
 
-#: lib/luks1/keyencryption.c:112
-msgid "Block mode LRW is available since kernel 2.6.20.\n"
-msgstr "Le mode \"bloc\" LRW est disponible depuis le noyau 2.6.20.\n"
+#: lib/utils_device.c:387
+#, c-format
+msgid "Cannot get info about device %s.\n"
+msgstr "Impossible d'obtenir des informations au sujet du périphérique %s.\n"
 
-#: lib/luks1/keyencryption.c:135
+#: lib/utils_device.c:393
+#, c-format
+msgid "Requested offset is beyond real size of device %s.\n"
+msgstr "Le décalage demandé est au delà de la taille réelle du périphérique %s.\n"
+
+#: lib/utils_device.c:401
+#, c-format
+msgid "Device %s has zero size.\n"
+msgstr "Le périphérique %s a une taille nulle.\n"
+
+#: lib/utils_device.c:412 lib/luks1/keymanage.c:89
+#, c-format
+msgid "Device %s is too small.\n"
+msgstr "Le périphérique %s est trop petit.\n"
+
+#: lib/luks1/keyencryption.c:66 lib/luks1/keymanage.c:295
+#: lib/luks1/keymanage.c:564 lib/luks1/keymanage.c:981
+#, c-format
+msgid "Cannot write to device %s, permission denied.\n"
+msgstr "Impossible d'écrire sur le périphérique %s. Permission refusée.\n"
+
+#: lib/luks1/keyencryption.c:91
+msgid "Key size in XTS mode must be 256 or 512 bits.\n"
+msgstr "La taille de la clé en mode XTS doit être un multiple de 256 ou 512 bits.\n"
+
+#: lib/luks1/keyencryption.c:117
 msgid "Failed to obtain device mapper directory."
-msgstr "Impossible d'obtenir le répertoire du gestionnaire \"device mapper\"."
+msgstr "Impossible d'obtenir le répertoire du gestionnaire « device mapper »."
 
-#: lib/luks1/keyencryption.c:151
+#: lib/luks1/keyencryption.c:133
 #, c-format
 msgid ""
 "Failed to setup dm-crypt key mapping for device %s.\n"
 "Check that kernel supports %s cipher (check syslog for more info).\n"
 "%s"
 msgstr ""
-"Impossible de configurer la clé dm-crypt pour le périphérique %s.\n"
-"Vérifiez que votre noyau supporte le chiffrement %s (pour plus d'informations, voir les journaux du système).\n"
+"Impossible de configurer la correspondance des clés dm-crypt pour le périphérique %s.\n"
+"Vérifiez que le noyau supporte le chiffrement %s (pour plus d'informations, voir les journaux du système).\n"
 "%s"
 
-#: lib/luks1/keyencryption.c:161
+#: lib/luks1/keyencryption.c:143
 msgid "Failed to open temporary keystore device.\n"
 msgstr "Échec lors de l'ouverture du périphérique de stockage temporaire de clés.\n"
 
-#: lib/luks1/keyencryption.c:168
+#: lib/luks1/keyencryption.c:150
 msgid "Failed to access temporary keystore device.\n"
 msgstr "Impossible d'accéder au périphérique de stockage temporaire de clé.\n"
 
-#: lib/luks1/keymanage.c:76
+#: lib/luks1/keymanage.c:161
 #, c-format
 msgid "Requested file %s already exist.\n"
-msgstr "Le fichier demandé (%s) existe déjà.\n"
+msgstr "Le fichier demandé %s existe déjà.\n"
 
-#: lib/luks1/keymanage.c:96 lib/luks1/keymanage.c:239
+#: lib/luks1/keymanage.c:181 lib/luks1/keymanage.c:417
+#: src/cryptsetup_reencrypt.c:1014
 #, c-format
 msgid "Device %s is not a valid LUKS device.\n"
 msgstr "%s n'est pas un périphérique LUKS valide.\n"
 
-#: lib/luks1/keymanage.c:116
+#: lib/luks1/keymanage.c:202
 #, c-format
 msgid "Cannot write header backup file %s.\n"
 msgstr "Impossible d'écrire le fichier de sauvegarde d'en-tête %s.\n"
 
-#: lib/luks1/keymanage.c:143
+#: lib/luks1/keymanage.c:229
 #, c-format
 msgid "Backup file %s doesn't exist.\n"
 msgstr "Le fichier de sauvegarde %s n'existe pas.\n"
 
-#: lib/luks1/keymanage.c:151
-msgid "Backup file do not contain valid LUKS header.\n"
+#: lib/luks1/keymanage.c:238
+msgid "Backup file doesn't contain valid LUKS header.\n"
 msgstr "Le fichier de sauvegarde ne contient pas d'en-tête LUKS valide.\n"
 
-#: lib/luks1/keymanage.c:164
+#: lib/luks1/keymanage.c:251
 #, c-format
 msgid "Cannot open header backup file %s.\n"
 msgstr "Impossible d'ouvrir le fichier de sauvegarde d'en-tête %s.\n"
 
-#: lib/luks1/keymanage.c:170
+#: lib/luks1/keymanage.c:257
 #, c-format
 msgid "Cannot read header backup file %s.\n"
 msgstr "Impossible de lire le fichier de sauvegarde d'en-tête %s.\n"
 
-#: lib/luks1/keymanage.c:181
+#: lib/luks1/keymanage.c:268
 msgid "Data offset or key size differs on device and backup, restore failed.\n"
-msgstr "Il y a une incohérence entre le périphérique et la sauvegarde, au niveau du décalage des données (« offset ») ou de la taille de la clé. La restauration a échoué.\n"
+msgstr "Le décalage des données (« offset ») ou la taille de la clé ne sont pas identiques dans le périphérique et la sauvegarde. La restauration a échouée.\n"
 
-#: lib/luks1/keymanage.c:189
+#: lib/luks1/keymanage.c:276
 #, c-format
 msgid "Device %s %s%s"
 msgstr "Périphérique %s %s%s"
 
-#: lib/luks1/keymanage.c:190
+#: lib/luks1/keymanage.c:277
 msgid "does not contain LUKS header. Replacing header can destroy data on that device."
 msgstr "ne contient pas d'en-tête LUKS. Remplacer l'en-tête peut détruire les données de ce périphérique."
 
-#: lib/luks1/keymanage.c:191
+#: lib/luks1/keymanage.c:278
 msgid "already contains LUKS header. Replacing header will destroy existing keyslots."
 msgstr "contient déjà un en-tête LUKS. Remplacer l'en-tête détruira les emplacements de clés actuels."
 
-#: lib/luks1/keymanage.c:192
+#: lib/luks1/keymanage.c:279
 msgid ""
 "\n"
 "WARNING: real device header has different UUID than backup!"
@@ -487,288 +471,437 @@ msgstr ""
 "\n"
 "ATTENTION : l'en-tête du périphérique a un UUID différent de celui de la sauvegarde !"
 
-#: lib/luks1/keymanage.c:207 lib/luks1/keymanage.c:320
-#: lib/luks1/keymanage.c:355
+#: lib/luks1/keymanage.c:328
+msgid "Non standard key size, manual repair required.\n"
+msgstr "Taille de clé non standard. Réparation manuelle requise.\n"
+
+#: lib/luks1/keymanage.c:333
+msgid "Non standard keyslots alignment, manual repair required.\n"
+msgstr "Alignement non standard des emplacements de clé. Réparation manuelle requise.\n"
+
+#: lib/luks1/keymanage.c:339
+msgid "Repairing keyslots.\n"
+msgstr "Réparation des emplacements de clé.\n"
+
+#: lib/luks1/keymanage.c:350
+msgid "Repair failed."
+msgstr "Échec de la réparation."
+
+#: lib/luks1/keymanage.c:362
 #, c-format
-msgid "Cannot open device %s.\n"
-msgstr "Impossible d'ouvrir le périphérique %s.\n"
+msgid "Keyslot %i: offset repaired (%u -> %u).\n"
+msgstr "Emplacement de clé %i : décalage réparé (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:241
+#: lib/luks1/keymanage.c:370
 #, c-format
-msgid "Device %s is not a valid LUKS device."
-msgstr "%s n'est pas un périphérique LUKS valide."
+msgid "Keyslot %i: stripes repaired (%u -> %u).\n"
+msgstr "Emplacement de clé %i : bandes réparées (%u -> %u).\n"
+
+#: lib/luks1/keymanage.c:379
+#, c-format
+msgid "Keyslot %i: bogus partition signature.\n"
+msgstr "Emplacement de clé %i : signature de partition contrefaite.\n"
+
+#: lib/luks1/keymanage.c:384
+#, c-format
+msgid "Keyslot %i: salt wiped.\n"
+msgstr "Emplacement de clé %i : aléa effacé.\n"
+
+#: lib/luks1/keymanage.c:395
+msgid "Writing LUKS header to disk.\n"
+msgstr "Écriture de l'en-tête LUKS sur le disque.\n"
 
-#: lib/luks1/keymanage.c:244
+#: lib/luks1/keymanage.c:420
 #, c-format
 msgid "Unsupported LUKS version %d.\n"
 msgstr "La version %d de LUKS n'est pas supportée.\n"
 
-#: lib/luks1/keymanage.c:247 lib/luks1/keymanage.c:425
+#: lib/luks1/keymanage.c:426 lib/luks1/keymanage.c:639
 #, c-format
 msgid "Requested LUKS hash %s is not supported.\n"
 msgstr "L'algorithme de hachage LUKS demandé (%s) n'est pas supporté.\n"
 
-#: lib/luks1/keymanage.c:292
+#: lib/luks1/keymanage.c:441
 #, c-format
-msgid "Cannot open file %s.\n"
-msgstr "Impossible d'ouvrir le fichier %s.\n"
+msgid "LUKS keyslot %u is invalid.\n"
+msgstr "L'emplacement de clé LUKS %u n'est pas valide.\n"
 
-#: lib/luks1/keymanage.c:332
+#: lib/luks1/keymanage.c:455 src/cryptsetup.c:388
+msgid "No known problems detected for LUKS header.\n"
+msgstr "Aucun problème connu détecté pour l'en-tête LUKS.\n"
+
+#: lib/luks1/keymanage.c:488
 #, c-format
-msgid "LUKS header detected but device %s is too small.\n"
-msgstr "En-tête LUKs détecté mais le périphérique %s est trop petit.\n"
+msgid "Cannot open file %s.\n"
+msgstr "Impossible d'ouvrir le fichier %s.\n"
 
-#: lib/luks1/keymanage.c:376
+#: lib/luks1/keymanage.c:588
 #, c-format
 msgid "Error during update of LUKS header on device %s.\n"
 msgstr "Erreur lors de la mise à jour de l'en-tête LUKS sur le périphérique %s.\n"
 
-#: lib/luks1/keymanage.c:383
+#: lib/luks1/keymanage.c:595
 #, c-format
 msgid "Error re-reading LUKS header after update on device %s.\n"
 msgstr "Erreur lors de la relecture de l'en-tête LUKS après la mise à jour sur le périphérique %s.\n"
 
-#: lib/luks1/keymanage.c:395
+#: lib/luks1/keymanage.c:608
 #, c-format
 msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n"
 msgstr "Options PBKDF2 incompatibles (en utilisant l'algorithme de hachage %s).\n"
 
-#: lib/luks1/keymanage.c:430 lib/luks1/keymanage.c:507
+#: lib/luks1/keymanage.c:644 lib/luks1/keymanage.c:726
 msgid "Wrong LUKS UUID format provided.\n"
-msgstr "Mauvais format d'UUID Luks fourni.\n"
+msgstr "Mauvais format fourni pour le UUID LUKS.\n"
 
-#: lib/luks1/keymanage.c:455
+#: lib/luks1/keymanage.c:669
 msgid "Cannot create LUKS header: reading random salt failed.\n"
 msgstr "Impossible de créer un en-tête LUKS : échec lors de la lecture de l'aléa.\n"
 
-#: lib/luks1/keymanage.c:472
+#: lib/luks1/keymanage.c:686
 #, c-format
 msgid "Cannot create LUKS header: header digest failed (using hash %s).\n"
 msgstr "Impossible de créer un en-tête LUKS : le résumé (« digest ») de l'en-tête a échoué (en utilisant l'algorithme de hachage %s).\n"
 
-#: lib/luks1/keymanage.c:532
+#: lib/luks1/keymanage.c:751
 #, c-format
 msgid "Key slot %d active, purge first.\n"
 msgstr "L'emplacement de clé %d est activé, effacez-le d'abord.\n"
 
-#: lib/luks1/keymanage.c:537
+#: lib/luks1/keymanage.c:757
 #, c-format
 msgid "Key slot %d material includes too few stripes. Header manipulation?\n"
-msgstr "Le matériel de clé contenu à l'emplacement %d a trop peu de bandes. L'en-tête a-t-il été modifié ?\n"
+msgstr "Le matériel de l'emplacement de clé %d a trop peu de bandes. L'en-tête a-t-il été modifié ?\n"
 
-#: lib/luks1/keymanage.c:603
-msgid "Failed to write to key storage.\n"
-msgstr "Échec lors de l'écriture à l'emplacement de stockage de la clé.\n"
-
-#: lib/luks1/keymanage.c:686
-msgid "Failed to read from key storage.\n"
-msgstr "Échec lors de la lecture depuis l'emplacement de stockage de la clé.\n"
-
-#: lib/luks1/keymanage.c:696
+#: lib/luks1/keymanage.c:914
 #, c-format
 msgid "Key slot %d unlocked.\n"
-msgstr "Emplacement de clé %d débloqué.\n"
+msgstr "Emplacement de clé %d déverrouillé.\n"
 
-#: lib/luks1/keymanage.c:732 src/cryptsetup.c:566 src/cryptsetup.c:748
+#: lib/luks1/keymanage.c:949 src/cryptsetup.c:587 src/cryptsetup.c:771
+#: src/cryptsetup_reencrypt.c:918 src/cryptsetup_reencrypt.c:952
 msgid "No key available with this passphrase.\n"
-msgstr "Aucune clé n'est disponible avec cette phrase secrète.\n"
+msgstr "Aucune clé disponible avec cette phrase secrète.\n"
 
-#: lib/luks1/keymanage.c:812
+#: lib/luks1/keymanage.c:967
 #, c-format
 msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n"
 msgstr "L'emplacement de clé %d n'est pas valide, merci de sélectionner un emplacement entre 0 et %d.\n"
 
-#: lib/luks1/keymanage.c:824
+#: lib/luks1/keymanage.c:985
 #, c-format
 msgid "Cannot wipe device %s.\n"
 msgstr "Impossible d'effacer de façon sécurisée le périphérique %s.\n"
 
-#: lib/loopaes/loopaes.c:135
+#: lib/loopaes/loopaes.c:143
 msgid "Detected not yet supported GPG encrypted keyfile.\n"
 msgstr "Fichier de clé GPG chiffré détecté mais pas encore supporté.\n"
 
-#: lib/loopaes/loopaes.c:136
+#: lib/loopaes/loopaes.c:144
 msgid "Please use gpg --decrypt <KEYFILE> | cryptsetup --keyfile=- ...\n"
 msgstr "SVP utilisez gpg --decrypt <FICHIER DE CLE> | cryptsetup --keyfile=-...\n"
 
-#: lib/loopaes/loopaes.c:168
+#: lib/loopaes/loopaes.c:176
 msgid "Incompatible loop-AES keyfile detected.\n"
-msgstr "Fichier de clé incompatible pour boucle \"loopAES\".\n"
+msgstr "Fichier de clé incompatible pour boucle « loop-AES ».\n"
 
-#: lib/loopaes/loopaes.c:217
+#: lib/loopaes/loopaes.c:230
 msgid "Kernel doesn't support loop-AES compatible mapping.\n"
-msgstr "Le noyau ne supporte pas les associations de type boucle \"loopAES\".\n"
+msgstr "Le noyau ne supporte pas les associations de type boucle « loop-AES ».\n"
 
-#: src/cryptsetup.c:95
+#: lib/verity/verity.c:69 lib/verity/verity.c:168
+msgid "Verity device doesn't use on-disk header.\n"
+msgstr "Le périphérique verity n'utilise pas l'en-tête sur le disque.\n"
+
+#: lib/verity/verity.c:92
+#, c-format
+msgid "Device %s is not a valid VERITY device.\n"
+msgstr "Le périphérique %s n'est pas un périphérique VERITY valable.\n"
+
+#: lib/verity/verity.c:98
+#, c-format
+msgid "Unsupported VERITY version %d.\n"
+msgstr "La version VERITY %d n'est pas supportée.\n"
+
+#: lib/verity/verity.c:128
+msgid "VERITY header corrupted.\n"
+msgstr "En-tête VERITY corrompu.\n"
+
+#: lib/verity/verity.c:163
+msgid "Wrong VERITY UUID format provided.\n"
+msgstr "Mauvais format d'UUID VERITY fourni.\n"
+
+#: lib/verity/verity.c:191
+#, c-format
+msgid "Error during update of verity header on device %s.\n"
+msgstr "Erreur lors de la mise à jour de l'en-tête verity sur le périphérique %s.\n"
+
+#: lib/verity/verity.c:270
+msgid "Kernel doesn't support dm-verity mapping.\n"
+msgstr "Le noyau ne supporte pas les associations de type dm-verity.\n"
+
+#: lib/verity/verity.c:281
+msgid "Verity device detected corruption after activation.\n"
+msgstr "Le périphérique verity a détecté une corruption après l'activation.\n"
+
+#: lib/verity/verity_hash.c:58
+#, c-format
+msgid "Spare area is not zeroed at position %<PRIu64>.\n"
+msgstr "La zone de réserve n'a pas été mise à zéro à la positon %<PRIu64>.\n"
+
+#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:248
+#: lib/verity/verity_hash.c:278 lib/verity/verity_hash.c:285
+msgid "Device offset overflow.\n"
+msgstr "Débordement du décalage du périphérique.\n"
+
+#: lib/verity/verity_hash.c:160
+#, c-format
+msgid "Verification failed at position %<PRIu64>.\n"
+msgstr "La vérification a échoué à la position %<PRIu64>.\n"
+
+#: lib/verity/verity_hash.c:234
+msgid "Invalid size parameters for verity device.\n"
+msgstr "Mauvais paramètres de taille pour le périphérique verity.\n"
+
+#: lib/verity/verity_hash.c:266
+msgid "Too many tree levels for verity volume.\n"
+msgstr "Trop de niveaux dans l'arborescence du volume verity.\n"
+
+#: lib/verity/verity_hash.c:355
+msgid "Verification of data area failed.\n"
+msgstr "La vérification de la zone de données a échoué.\n"
+
+#: lib/verity/verity_hash.c:360
+msgid "Verification of root hash failed.\n"
+msgstr "La vérification du hachage de la racine a échoué.\n"
+
+#: lib/verity/verity_hash.c:366
+msgid "Input/output error while creating hash area.\n"
+msgstr "Erreur d'entrée/sortie lors de la création de la zone de hachage.\n"
+
+#: lib/verity/verity_hash.c:368
+msgid "Creation of hash area failed.\n"
+msgstr "La création de la zone de hachage a échoué.\n"
+
+#: lib/verity/verity_hash.c:415
+#, c-format
+msgid "WARNING: Kernel cannot activate device if data block size exceeds page size (%u).\n"
+msgstr "ATTENTION : Le kernel ne peut pas activer le périphérique si la taille des blocs de données dépasse la taille d'une page (%u).\n"
+
+#: src/cryptsetup.c:88
 msgid "<name> <device>"
 msgstr "<nom> <périphérique>"
 
-#: src/cryptsetup.c:95
+#: src/cryptsetup.c:88
 msgid "create device"
 msgstr "créer un périphérique"
 
-#: src/cryptsetup.c:96 src/cryptsetup.c:97 src/cryptsetup.c:98
-#: src/cryptsetup.c:107 src/cryptsetup.c:114
+#: src/cryptsetup.c:89 src/cryptsetup.c:90 src/cryptsetup.c:91
+#: src/cryptsetup.c:101 src/cryptsetup.c:108 src/veritysetup.c:311
+#: src/veritysetup.c:312
 msgid "<name>"
 msgstr "<nom>"
 
-#: src/cryptsetup.c:96
+#: src/cryptsetup.c:89
 msgid "remove device"
 msgstr "retirer le périphérique"
 
-#: src/cryptsetup.c:97
+#: src/cryptsetup.c:90
 msgid "resize active device"
 msgstr "redimensionner le périphérique actif"
 
-#: src/cryptsetup.c:98
+#: src/cryptsetup.c:91
 msgid "show device status"
 msgstr "afficher le statut du périphérique"
 
-#: src/cryptsetup.c:99 src/cryptsetup.c:101
+#: src/cryptsetup.c:92 src/cryptsetup.c:99 src/cryptsetup.c:100
+#: src/cryptsetup.c:102 src/cryptsetup.c:103 src/cryptsetup.c:104
+#: src/cryptsetup.c:105 src/cryptsetup.c:106
+msgid "<device>"
+msgstr "<périphérique>"
+
+#: src/cryptsetup.c:92
+msgid "try to repair on-disk metadata"
+msgstr "essayer de réparer les métadonnées sur le disque"
+
+#: src/cryptsetup.c:93 src/cryptsetup.c:95
 msgid "<device> [<new key file>]"
 msgstr "<périphérique> [<fichier de la nouvelle clé>]"
 
-#: src/cryptsetup.c:99
+#: src/cryptsetup.c:93
 msgid "formats a LUKS device"
 msgstr "formate un périphérique LUKS"
 
-#: src/cryptsetup.c:100 src/cryptsetup.c:113
+#: src/cryptsetup.c:94 src/cryptsetup.c:107
 msgid "<device> <name> "
 msgstr "<périphérique> <nom> "
 
-#: src/cryptsetup.c:100
+#: src/cryptsetup.c:94
 msgid "open LUKS device as mapping <name>"
 msgstr "ouvrir un périphérique LUKS avec <nom> comme « mapping »"
 
-#: src/cryptsetup.c:101
+#: src/cryptsetup.c:95
 msgid "add key to LUKS device"
 msgstr "ajouter une clé au périphérique LUKS"
 
-#: src/cryptsetup.c:102 src/cryptsetup.c:103
+#: src/cryptsetup.c:96 src/cryptsetup.c:97
 msgid "<device> [<key file>]"
 msgstr "<périphérique> [<fichier de clé>]"
 
-#: src/cryptsetup.c:102
+#: src/cryptsetup.c:96
 msgid "removes supplied key or key file from LUKS device"
 msgstr "retire du périphérique LUKS la clé ou le fichier de clé fourni"
 
-#: src/cryptsetup.c:103
+#: src/cryptsetup.c:97
 msgid "changes supplied key or key file of LUKS device"
 msgstr "modifie la clé ou le fichier de clé fourni pour le périphérique LUKS"
 
-#: src/cryptsetup.c:104
+#: src/cryptsetup.c:98
 msgid "<device> <key slot>"
 msgstr "<périphérique> <emplacement de clé>"
 
-#: src/cryptsetup.c:104
+#: src/cryptsetup.c:98
 msgid "wipes key with number <key slot> from LUKS device"
 msgstr "efface de façon sécurisée la clé avec le numéro <emplacement de clé> du périphérique LUKS"
 
-#: src/cryptsetup.c:105 src/cryptsetup.c:106 src/cryptsetup.c:108
-#: src/cryptsetup.c:109 src/cryptsetup.c:110 src/cryptsetup.c:111
-#: src/cryptsetup.c:112
-msgid "<device>"
-msgstr "<périphérique>"
-
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:99
 msgid "print UUID of LUKS device"
 msgstr "afficher l'UUID du périphérique LUKS"
 
-#: src/cryptsetup.c:106
+#: src/cryptsetup.c:100
 msgid "tests <device> for LUKS partition header"
 msgstr "teste si <périphérique> a un en-tête de partition LUKS"
 
-#: src/cryptsetup.c:107
+#: src/cryptsetup.c:101
 msgid "remove LUKS mapping"
 msgstr "retire une association LUKS"
 
-#: src/cryptsetup.c:108
+#: src/cryptsetup.c:102
 msgid "dump LUKS partition information"
 msgstr "affiche les informations LUKS de la partition"
 
-#: src/cryptsetup.c:109
+#: src/cryptsetup.c:103
 msgid "Suspend LUKS device and wipe key (all IOs are frozen)."
-msgstr "Mettre le périphérique LUKS en hibernation et effacer de façon sécurisée la clé (toutes les entrées/sorties sont suspendues)."
+msgstr "Suspend le périphérique LUKS et effacer de façon sécurisée la clé (toutes les entrées/sorties sont suspendues)."
 
-#: src/cryptsetup.c:110
+#: src/cryptsetup.c:104
 msgid "Resume suspended LUKS device."
-msgstr "Réveiller le périphérique LUKS de son hibernation."
+msgstr "Remettre en service le périphérique LUKS suspendu."
 
-#: src/cryptsetup.c:111
+#: src/cryptsetup.c:105
 msgid "Backup LUKS device header and keyslots"
 msgstr "Sauvegarder l'en-tête et les emplacements de clés du périphérique LUKS"
 
-#: src/cryptsetup.c:112
+#: src/cryptsetup.c:106
 msgid "Restore LUKS device header and keyslots"
 msgstr "Restaurer l'en-tête et les emplacements de clés du périphérique LUKS"
 
-#: src/cryptsetup.c:113
+#: src/cryptsetup.c:107
 msgid "open loop-AES device as mapping <name>"
-msgstr "ouvre un périphérique \"loopAES\" avec pour nom associé <nom>"
+msgstr "ouvre un périphérique loop-AES avec pour nom associé <nom>"
 
-#: src/cryptsetup.c:114
+#: src/cryptsetup.c:108
 msgid "remove loop-AES mapping"
-msgstr "enlève une association \"loopAES\""
-
-#: src/cryptsetup.c:196
-msgid "Command successful.\n"
-msgstr "Opération réussie.\n"
+msgstr "enlève une association loop-AES"
 
-#: src/cryptsetup.c:210
-#, c-format
-msgid "Command failed with code %i"
-msgstr "L'opération a échoué, code %i"
+#: src/cryptsetup.c:123
+msgid "Can't do passphrase verification on non-tty inputs.\n"
+msgstr "Impossible de vérifier une phrase secrète non saisie sur une console.\n"
 
-#: src/cryptsetup.c:298
+#: src/cryptsetup.c:226
 msgid "Option --key-file is required.\n"
 msgstr "L'option --key-file est requise.\n"
 
-#: src/cryptsetup.c:435
+#: src/cryptsetup.c:392
+msgid "Really try to repair LUKS device header?"
+msgstr "Réellement essayer de réparer l'en-tête du périphérique LUKS ?"
+
+#: src/cryptsetup.c:417
 #, c-format
 msgid "This will overwrite data on %s irrevocably."
 msgstr "Cette action écrasera définitivement les données sur %s."
 
-#: src/cryptsetup.c:436
+#: src/cryptsetup.c:419
 msgid "memory allocation error in action_luksFormat"
 msgstr "erreur d'allocation de mémoire dans action_luksFormat"
 
-#: src/cryptsetup.c:730
+#: src/cryptsetup.c:431 src/cryptsetup_reencrypt.c:522
+#: src/cryptsetup_reencrypt.c:557
+msgid "No known cipher specification pattern detected.\n"
+msgstr "Aucun motif connu d'algorithme de chiffrement n'a été détecté.\n"
+
+#: src/cryptsetup.c:437
+#, c-format
+msgid "Cannot use %s as on-disk header.\n"
+msgstr "Ne peut utiliser %s comme en-tête sur disque.\n"
+
+#: src/cryptsetup.c:452 src/cryptsetup.c:885
+msgid "Enter LUKS passphrase: "
+msgstr "Saisissez la phrase secrète LUKS : "
+
+#: src/cryptsetup.c:509
+msgid "Reduced data offset is allowed only for detached LUKS header.\n"
+msgstr "Décalage réduit de données est uniquement permis dans un en-tête LUKS détaché.\n"
+
+#: src/cryptsetup.c:610 src/cryptsetup.c:665
+#, c-format
+msgid "Key slot %d selected for deletion.\n"
+msgstr "Emplacement de clé %d sélectionné pour suppression.\n"
+
+#: src/cryptsetup.c:613
+#, c-format
+msgid "Key %d not active. Can't wipe.\n"
+msgstr "La clé %d n'est pas active. Impossible de l'effacer.\n"
+
+#: src/cryptsetup.c:621 src/cryptsetup.c:668
+msgid "This is the last keyslot. Device will become unusable after purging this key."
+msgstr "Ceci est le dernier emplacement de clé. Le périphérique sera inutilisable après la suppression de cette clé."
+
+#: src/cryptsetup.c:622
+msgid "Enter any remaining LUKS passphrase: "
+msgstr "Entrez toute phrase secrète LUKS restante : "
+
+#: src/cryptsetup.c:650
+msgid "Enter LUKS passphrase to be deleted: "
+msgstr "Entrez la phrase secrète LUKS à effacer : "
+
+#: src/cryptsetup.c:753
 msgid "Enter LUKS passphrase to be changed: "
-msgstr "Entrez la phrase secrète LUKS à changer :"
+msgstr "Entrez la phrase secrète LUKS à changer : "
 
-#: src/cryptsetup.c:767
+#: src/cryptsetup.c:790 src/cryptsetup_reencrypt.c:970
 msgid "Enter new LUKS passphrase: "
-msgstr "Entrez la nouvelle phrase secrète LUKS :"
+msgstr "Entrez la nouvelle phrase secrète LUKS : "
 
-#: src/cryptsetup.c:780
+#: src/cryptsetup.c:804
 #, c-format
 msgid "Key slot %d changed.\n"
 msgstr "Emplacement de clef %d modifié.\n"
 
-#: src/cryptsetup.c:786
+#: src/cryptsetup.c:810
 #, c-format
 msgid "Replaced with key slot %d.\n"
 msgstr "Remplacé par l'emplacement de clé %d.\n"
 
-#: src/cryptsetup.c:791
+#: src/cryptsetup.c:815
 msgid "Failed to swap new key slot.\n"
-msgstr "Nouvel emplacement de clé impossible à utiliser.\n"
+msgstr "Nouvel emplacement de clé impossible à échanger.\n"
 
-#: src/cryptsetup.c:848
+#: src/cryptsetup.c:874
 msgid ""
 "LUKS header dump with volume key is sensitive information\n"
 "which allows access to encrypted partition without passphrase.\n"
 "This dump should be always stored encrypted on safe place."
 msgstr ""
-"Le contenu de l'entête LUKS avec la clef de volume est une information\n"
+"Le contenu de l'en-tête LUKS avec la clef de volume est une information\n"
 "sensible qui permet d'accéder à la partition chiffrée sans mot de passe.\n"
 "Ce contenu devrait toujours être stocké, chiffré, en lieu sûr."
 
-#: src/cryptsetup.c:951 src/cryptsetup.c:972
+#: src/cryptsetup.c:979 src/cryptsetup.c:1000
 msgid "Option --header-backup-file is required.\n"
 msgstr "L'option --header-backup-file est requise.\n"
 
-#: src/cryptsetup.c:1006
+#: src/cryptsetup.c:1027 src/veritysetup.c:328
 msgid ""
 "\n"
 "<action> is one of:\n"
@@ -776,7 +909,7 @@ msgstr ""
 "\n"
 "<action> est l'une de :\n"
 
-#: src/cryptsetup.c:1012
+#: src/cryptsetup.c:1033
 #, c-format
 msgid ""
 "\n"
@@ -791,7 +924,7 @@ msgstr ""
 "<emplacement> est le numéro de l'emplacement de clé LUKS à modifier\n"
 "<fichier de clé> est un fichier optionnel contenant la nouvelle clé pour l'action luksAddKey\n"
 
-#: src/cryptsetup.c:1019
+#: src/cryptsetup.c:1040
 #, c-format
 msgid ""
 "\n"
@@ -799,10 +932,10 @@ msgid ""
 "\tMaximum keyfile size: %dkB, Maximum interactive passphrase length %d (characters)\n"
 msgstr ""
 "\n"
-"Paramètres compilés par défaut pour les fichiers de clé :\n"
-"\tTaille max. fichier de clé : %d Ko, longueur max. de phrase secrète %d (caractères)\n"
+"Paramètres compilés par défaut pour les fichiers de clé :\n"
+"\tTaille max. fichier de clé : %d Ko, longueur max. de phrase secrète %d (caractères)\n"
 
-#: src/cryptsetup.c:1024
+#: src/cryptsetup.c:1045
 #, c-format
 msgid ""
 "\n"
@@ -812,208 +945,641 @@ msgid ""
 "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n"
 msgstr ""
 "\n"
-"Paramètres de chiffrement compilés par défaut :\n"
-"\tloop-AES: %s, Key %d bits\n"
-"\tplain: %s, Key: %d bits, Password hashing: %s\n"
-"\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n"
+"Paramètres de chiffrement compilés par défaut :\n"
+"\tloop-AES: %s, Clé %d bits\n"
+"\tplain: %s, Clé: %d bits, Hachage mot de passe: %s\n"
+"\tLUKS1: %s, Clé: %d bits, Hachage en-tête LUKS: %s, RNG: %s\n"
 
-#: src/cryptsetup.c:1092
+#: src/cryptsetup.c:1085 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1135
 msgid "Show this help message"
 msgstr "Afficher ce message d'aide"
 
-#: src/cryptsetup.c:1093
+#: src/cryptsetup.c:1086 src/veritysetup.c:369 src/cryptsetup_reencrypt.c:1136
 msgid "Display brief usage"
 msgstr "Afficher, en résumé, la syntaxe d'invocation"
 
-#: src/cryptsetup.c:1097
+#: src/cryptsetup.c:1090 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1140
 msgid "Help options:"
 msgstr "Options d'aide :"
 
-#: src/cryptsetup.c:1098
+#: src/cryptsetup.c:1091 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1141
 msgid "Print package version"
 msgstr "Afficher la version du paquet"
 
-#: src/cryptsetup.c:1099
+#: src/cryptsetup.c:1092 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1142
 msgid "Shows more detailed error messages"
 msgstr "Affiche des messages d'erreur plus détaillés"
 
-#: src/cryptsetup.c:1100
+#: src/cryptsetup.c:1093 src/veritysetup.c:376 src/cryptsetup_reencrypt.c:1143
 msgid "Show debug messages"
 msgstr "Afficher les messages de débogage"
 
-#: src/cryptsetup.c:1101
+#: src/cryptsetup.c:1094 src/cryptsetup_reencrypt.c:1145
 msgid "The cipher used to encrypt the disk (see /proc/crypto)"
-msgstr "L'algorithme (« cipher ») utilisé pour chiffrer le disque (voir /proc/crypto)"
+msgstr "L'algorithme de chiffrement utilisé pour chiffrer le disque (voir /proc/crypto)"
 
-#: src/cryptsetup.c:1102
+#: src/cryptsetup.c:1095 src/cryptsetup_reencrypt.c:1147
 msgid "The hash used to create the encryption key from the passphrase"
 msgstr "L'algorithme de hachage utilisé pour créer la clé de chiffrement à partir de la phrase secrète"
 
-#: src/cryptsetup.c:1103
+#: src/cryptsetup.c:1096
 msgid "Verifies the passphrase by asking for it twice"
 msgstr "Vérifie la phrase secrète en la demandant deux fois"
 
-#: src/cryptsetup.c:1104
+#: src/cryptsetup.c:1097 src/cryptsetup_reencrypt.c:1148
 msgid "Read the key from a file."
 msgstr "Lit la clef depuis un fichier."
 
-#: src/cryptsetup.c:1105
+#: src/cryptsetup.c:1098
 msgid "Read the volume (master) key from file."
 msgstr "Lit la clé (maîtresse) du volume depuis un fichier."
 
-#: src/cryptsetup.c:1106
+#: src/cryptsetup.c:1099
 msgid "Dump volume (master) key instead of keyslots info."
-msgstr "Liste les informations de la clef (maîtresse) de volume au lieu des autres emplacements de clefs."
+msgstr "Liste les informations de la clé (maîtresse) de volume au lieu des autres emplacements de clefs."
 
-#: src/cryptsetup.c:1107
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "The size of the encryption key"
 msgstr "La taille de la clé de chiffrement"
 
-#: src/cryptsetup.c:1107
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "BITS"
 msgstr "BITS"
 
-#: src/cryptsetup.c:1108
+#: src/cryptsetup.c:1101 src/cryptsetup_reencrypt.c:1159
 msgid "Limits the read from keyfile"
-msgstr "Limite la lecture d'un fichier de clef"
+msgstr "Limite la lecture d'un fichier de clé"
 
-#: src/cryptsetup.c:1108 src/cryptsetup.c:1109
+#: src/cryptsetup.c:1101 src/cryptsetup.c:1102 src/cryptsetup.c:1103
+#: src/cryptsetup.c:1104 src/veritysetup.c:379 src/veritysetup.c:380
+#: src/veritysetup.c:382 src/cryptsetup_reencrypt.c:1158
+#: src/cryptsetup_reencrypt.c:1159 src/cryptsetup_reencrypt.c:1160
+#: src/cryptsetup_reencrypt.c:1161
 msgid "bytes"
 msgstr "octets"
 
-#: src/cryptsetup.c:1109
+#: src/cryptsetup.c:1102 src/cryptsetup_reencrypt.c:1158
+msgid "Number of bytes to skip in keyfile"
+msgstr "Nombre d'octets à ignorer dans le fichier de clé"
+
+#: src/cryptsetup.c:1103
 msgid "Limits the read from newly added keyfile"
-msgstr "Limite la lecture d'un nouveau fichier de clef ajouté"
+msgstr "Limite la lecture d'un nouveau fichier de clé ajouté"
 
-#: src/cryptsetup.c:1110
+#: src/cryptsetup.c:1104
+msgid "Number of bytes to skip in newly added keyfile"
+msgstr "Nombre d'octets à ignorer dans le fichier de clé nouvellement ajouté"
+
+#: src/cryptsetup.c:1105
 msgid "Slot number for new key (default is first free)"
 msgstr "Numéro de l'emplacement pour la nouvelle clé (par défaut, le premier disponible)"
 
-#: src/cryptsetup.c:1111
+#: src/cryptsetup.c:1106
 msgid "The size of the device"
 msgstr "La taille du périphérique"
 
-#: src/cryptsetup.c:1111 src/cryptsetup.c:1112 src/cryptsetup.c:1113
-#: src/cryptsetup.c:1119
+#: src/cryptsetup.c:1106 src/cryptsetup.c:1107 src/cryptsetup.c:1108
+#: src/cryptsetup.c:1114
 msgid "SECTORS"
 msgstr "SECTEURS"
 
-#: src/cryptsetup.c:1112
+#: src/cryptsetup.c:1107
 msgid "The start offset in the backend device"
-msgstr "Le décalage à partir du début du périphérique sous-jacent"
+msgstr "Le décalage de départ dans le périphérique sous-jacent"
 
-#: src/cryptsetup.c:1113
+#: src/cryptsetup.c:1108
 msgid "How many sectors of the encrypted data to skip at the beginning"
-msgstr "Combien de secteurs de données chiffrées sauter au début"
+msgstr "Combien de secteurs de données chiffrées à ignorer au début"
 
-#: src/cryptsetup.c:1114
+#: src/cryptsetup.c:1109
 msgid "Create a readonly mapping"
 msgstr "Crée une association en lecture seule"
 
-#: src/cryptsetup.c:1115
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "PBKDF2 iteration time for LUKS (in ms)"
 msgstr "Temps d'itération de PBKDF2 pour LUKS (en ms)"
 
-#: src/cryptsetup.c:1115
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "msecs"
 msgstr "ms"
 
-#: src/cryptsetup.c:1116
+#: src/cryptsetup.c:1111 src/cryptsetup_reencrypt.c:1150
 msgid "Do not ask for confirmation"
 msgstr "Ne pas demander confirmation"
 
-#: src/cryptsetup.c:1117
+#: src/cryptsetup.c:1112
 msgid "Timeout for interactive passphrase prompt (in seconds)"
 msgstr "Délai d'expiration de la demande interactive de phrase secrète (en secondes)"
 
-#: src/cryptsetup.c:1117
+#: src/cryptsetup.c:1112
 msgid "secs"
 msgstr "s"
 
-#: src/cryptsetup.c:1118
+#: src/cryptsetup.c:1113 src/cryptsetup_reencrypt.c:1151
 msgid "How often the input of the passphrase can be retried"
 msgstr "Nombre de tentatives possibles pour entrer la phrase secrète"
 
-#: src/cryptsetup.c:1119
+#: src/cryptsetup.c:1114
 msgid "Align payload at <n> sector boundaries - for luksFormat"
-msgstr "Utiliser une limite de <n> secteurs pour aligner les données - pour luksFormat"
+msgstr "Utiliser une limite de <n> secteurs pour aligner les données – pour luksFormat"
 
-#: src/cryptsetup.c:1120
+#: src/cryptsetup.c:1115
 msgid "File with LUKS header and keyslots backup."
 msgstr "Fichier contenant une sauvegarde de l'en-tête LUKS et des emplacements de clés."
 
-#: src/cryptsetup.c:1121
+#: src/cryptsetup.c:1116 src/cryptsetup_reencrypt.c:1152
 msgid "Use /dev/random for generating volume key."
-msgstr "Utiliser /dev/random pour générer la clef de volume."
+msgstr "Utiliser /dev/random pour générer la clé de volume."
 
-#: src/cryptsetup.c:1122
+#: src/cryptsetup.c:1117 src/cryptsetup_reencrypt.c:1153
 msgid "Use /dev/urandom for generating volume key."
-msgstr "Utiliser /dev/urandom pour générer la clef de volume."
+msgstr "Utiliser /dev/urandom pour générer la clé de volume."
 
-#: src/cryptsetup.c:1123
+#: src/cryptsetup.c:1118
+msgid "Share device with another non-overlapping crypt segment."
+msgstr "Partager le périphérique avec un autre segment chiffré sans recouvrement."
+
+#: src/cryptsetup.c:1119 src/veritysetup.c:385
 msgid "UUID for device to use."
 msgstr "UUID du périphérique à utiliser."
 
-#: src/cryptsetup.c:1141
-msgid "[OPTION...] <action> <action-specific>]"
-msgstr "[OPTION...] <action> <paramètres de l'action>]"
+#: src/cryptsetup.c:1120
+msgid "Allow discards (aka TRIM) requests for device."
+msgstr "Autoriser les demandes d'abandon (TRIM) pour le périphérique."
+
+#: src/cryptsetup.c:1121
+msgid "Device or file with separated LUKS header."
+msgstr "Périphérique ou fichier avec un en-tête LUKS séparé."
+
+#: src/cryptsetup.c:1122
+msgid "Do not activate device, just check passphrase."
+msgstr "Ne pas activer le périphérique. Vérifie simplement le phrase secrète."
 
-#: src/cryptsetup.c:1176
+#: src/cryptsetup.c:1140 src/veritysetup.c:402
+msgid "[OPTION...] <action> <action-specific>"
+msgstr "[OPTION...] <action> <paramètres de l'action>"
+
+#: src/cryptsetup.c:1180 src/veritysetup.c:439
 msgid "Argument <action> missing."
 msgstr "Il manque l'argument <action>."
 
-#: src/cryptsetup.c:1182
+#: src/cryptsetup.c:1186 src/veritysetup.c:445
 msgid "Unknown action."
 msgstr "Action inconnue."
 
-#: src/cryptsetup.c:1197
+#: src/cryptsetup.c:1201 src/veritysetup.c:460
 #, c-format
 msgid "%s: requires %s as arguments"
-msgstr "%s : les arguments %s sont requis."
+msgstr "%s : exige %s comme arguments."
+
+#: src/cryptsetup.c:1210
+msgid "Option --shared is allowed only for create operation.\n"
+msgstr "L'option --shared est utilisable uniquement avec la commande create.\n"
 
-#: src/cryptsetup.c:1209
+#: src/cryptsetup.c:1218
+msgid "Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"
+msgstr "L'option --allow-discards est utilisable uniquement avec les commandes luksOpen, loopaesOpen et create.\n"
+
+#: src/cryptsetup.c:1226
 msgid ""
 "Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n"
 "To limit read from keyfile use --keyfile-size=(bytes)."
 msgstr ""
 "L'option --key-size est utilisable seulement avec luksFormat, create et loopaesOpen.\n"
-"Pour limiter la lecture depuis un fichier de clef, utiliser --keyfile-size=(octets)."
+"Pour limiter la lecture depuis un fichier de clé, utilisez --keyfile-size=(octets)."
+
+#: src/cryptsetup.c:1233
+msgid "Option --test-passphrase is allowed only for luksOpen.\n"
+msgstr "L'option --test-passphrase est autorisée uniquement avec luksOpen.\n"
 
-#: src/cryptsetup.c:1216
+#: src/cryptsetup.c:1238 src/cryptsetup_reencrypt.c:1221
 msgid "Key size must be a multiple of 8 bits"
 msgstr "La taille de la clé doit être un multiple de 8 bits"
 
-#: src/cryptsetup.c:1223
+#: src/cryptsetup.c:1245 src/cryptsetup_reencrypt.c:1226
 msgid "Key slot is invalid."
-msgstr "Emplacement de clef non valide."
+msgstr "Emplacement de clé non valide."
 
-#: src/cryptsetup.c:1230
+#: src/cryptsetup.c:1252
 msgid "Option --key-file takes precedence over specified key file argument.\n"
-msgstr "L'option --key-file est prioritaire par rapport à un fichier de clef spécifié en argument.\n"
+msgstr "L'option --key-file est prioritaire par rapport à un fichier de clé spécifié en argument.\n"
 
-#: src/cryptsetup.c:1237
+#: src/cryptsetup.c:1260 src/veritysetup.c:467 src/cryptsetup_reencrypt.c:1210
 msgid "Negative number for option not permitted."
-msgstr "Nombre négatif non autorisé pour cette option."
+msgstr "Nombre négatif non autorisé pour l'option."
 
-#: src/cryptsetup.c:1242
+#: src/cryptsetup.c:1264 src/cryptsetup_reencrypt.c:1204
+#: src/cryptsetup_reencrypt.c:1230
 msgid "Only one of --use-[u]random options is allowed."
 msgstr "Seule une des deux possibilités --use-[u]random est autorisée."
 
-#: src/cryptsetup.c:1245
+#: src/cryptsetup.c:1268
 msgid "Option --use-[u]random is allowed only for luksFormat."
 msgstr "L'option --use-[u]random est autorisée seulement avec luksFormat."
 
-#: src/cryptsetup.c:1249
+#: src/cryptsetup.c:1272
 msgid "Option --uuid is allowed only for luksFormat and luksUUID."
 msgstr "L'option --uuid est autorisée seulement avec luksFormat et luksUUID."
 
-#: src/cryptsetup.c:1254
-msgid "Option --skip is supported only for create command.\n"
-msgstr "L'option --skip est utilisable uniquement avec la commande \"create\".\n"
+#: src/cryptsetup.c:1276
+msgid "Option --align-payload is allowed only for luksFormat."
+msgstr "L'option --align-payload est autorisée uniquement avec luksFormat."
 
-#: src/cryptsetup.c:1259
+#: src/cryptsetup.c:1281
+msgid "Option --skip is supported only for create and loopaesOpen commands.\n"
+msgstr "L'option --skip est utilisable uniquement avec les commandes create et loopaesOpen.\n"
+
+#: src/cryptsetup.c:1286
 msgid "Option --offset is supported only for create and loopaesOpen commands.\n"
-msgstr "L'option --offset est utilisable uniquement avec les commandes \"create\" et \"loopaesOpen\".\n"
+msgstr "L'option --offset est utilisable uniquement avec les commandes create et loopaesOpen.\n"
+
+#: src/veritysetup.c:56
+msgid "Invalid salt string specified.\n"
+msgstr "Chaîne d'aléa spécifiée invalide.\n"
+
+#: src/veritysetup.c:89
+#, c-format
+msgid "Cannot create hash image %s for writing.\n"
+msgstr "Impossible de créer l'image de hachage %s en écriture.\n"
+
+#: src/veritysetup.c:148
+msgid "Invalid root hash string specified.\n"
+msgstr "Chaîne de hachage racine invalide.\n"
+
+#: src/veritysetup.c:308
+msgid "<data_device> <hash_device>"
+msgstr "<périph_données> <périph_hachage>"
+
+#: src/veritysetup.c:308
+msgid "format device"
+msgstr "formater le périphérique"
+
+#: src/veritysetup.c:309
+msgid "<data_device> <hash_device> <root_hash>"
+msgstr "<périph_données> <périph_hachage> <hachage_racine>"
+
+#: src/veritysetup.c:309
+msgid "verify device"
+msgstr "vérifier le périphérique"
+
+#: src/veritysetup.c:310
+msgid "<name> <data_device> <hash_device> <root_hash>"
+msgstr "<nom> <périph_données> <périph_hachage> <hachage_racine>"
+
+#: src/veritysetup.c:310
+msgid "create active device"
+msgstr "créer le périphérique actif"
+
+#: src/veritysetup.c:311
+msgid "remove (deactivate) device"
+msgstr "supprime (désactive) le périphérique"
+
+#: src/veritysetup.c:312
+msgid "show active device status"
+msgstr "afficher le statut du périphérique actif"
+
+#: src/veritysetup.c:313
+msgid "<hash_device>"
+msgstr "<périph_hachage>"
+
+#: src/veritysetup.c:313
+msgid "show on-disk information"
+msgstr "afficher les informations sur le disque"
+
+#: src/veritysetup.c:332
+#, c-format
+msgid ""
+"\n"
+"<name> is the device to create under %s\n"
+"<data_device> is the data device\n"
+"<hash_device> is the device containing verification data\n"
+"<root_hash> hash of the root node on <hash_device>\n"
+msgstr ""
+"\n"
+"<nom> est le périphérique à créer sous %s\n"
+"<périph_données> est le périphérique de données\n"
+"<périph_hachage> est le périphérique contenant les données de vérification\n"
+"<hachage_racine> hachage du nœud racine sur <périph_hachage>\n"
+
+#: src/veritysetup.c:339
+#, c-format
+msgid ""
+"\n"
+"Default compiled-in dm-verity parameters:\n"
+"\tHash: %s, Data block (bytes): %u, Hash block (bytes): %u, Salt size: %u, Hash format: %u\n"
+msgstr ""
+"\n"
+"Paramètres compilés par défaut dans dm-verity :\n"
+"\tHachage: %s, Bloc données (octets): %u, Bloc hachage (octets): %u, Taille aléa: %u, Format hachage: %u\n"
+
+#: src/veritysetup.c:377
+msgid "Do not use verity superblock"
+msgstr "Ne pas utiliser le superbloc de verity"
+
+#: src/veritysetup.c:378
+msgid "Format type (1 - normal, 0 - original Chrome OS)"
+msgstr "Type de format (1: normal ; 0: Chrome OS)"
+
+#: src/veritysetup.c:378
+msgid "number"
+msgstr "nombre"
+
+#: src/veritysetup.c:379
+msgid "Block size on the data device"
+msgstr "Taille de bloc sur le périphérique de données"
+
+#: src/veritysetup.c:380
+msgid "Block size on the hash device"
+msgstr "Taille de bloc sur le périphérique de hachage"
+
+#: src/veritysetup.c:381
+msgid "The number of blocks in the data file"
+msgstr "Le nombre de blocs dans le fichier de données"
+
+#: src/veritysetup.c:381
+msgid "blocks"
+msgstr "blocs"
+
+#: src/veritysetup.c:382
+msgid "Starting offset on the hash device"
+msgstr "Décalage de départ dans le périphérique de hachage"
+
+#: src/veritysetup.c:383
+msgid "Hash algorithm"
+msgstr "Algorithme de hachage"
+
+#: src/veritysetup.c:383
+msgid "string"
+msgstr "chaîne"
+
+#: src/veritysetup.c:384
+msgid "Salt"
+msgstr "Aléa"
+
+#: src/veritysetup.c:384
+msgid "hex string"
+msgstr "chaîne hexa"
+
+#: src/cryptsetup_reencrypt.c:164
+#, c-format
+msgid "Cannot exclusively open %s, device in use.\n"
+msgstr "Impossible d'ouvrir exclusivement %s : périphérique utilisé.\n"
+
+#: src/cryptsetup_reencrypt.c:168
+#, c-format
+msgid "Cannot open device %s\n"
+msgstr "Impossible d'ouvrir le périphérique %s\n"
+
+#: src/cryptsetup_reencrypt.c:178 src/cryptsetup_reencrypt.c:406
+#: src/cryptsetup_reencrypt.c:822
+msgid "Allocation of aligned memory failed.\n"
+msgstr "La réservation de la mémoire alignée a échoué.\n"
+
+#: src/cryptsetup_reencrypt.c:185
+#, c-format
+msgid "Cannot read device %s.\n"
+msgstr "Impossible de lire le périphérique %s.\n"
+
+#: src/cryptsetup_reencrypt.c:196
+#, c-format
+msgid "Marking LUKS device %s unusable.\n"
+msgstr "Marque le périphérique LUKS %s comme inutilisable.\n"
+
+#: src/cryptsetup_reencrypt.c:201
+#, c-format
+msgid "Marking LUKS device %s usable.\n"
+msgstr "Marque le périphérique LUKS %s comme utilisable.\n"
+
+#: src/cryptsetup_reencrypt.c:217
+#, c-format
+msgid "Cannot write device %s.\n"
+msgstr "Impossible d'écrire le périphérique %s.\n"
+
+#: src/cryptsetup_reencrypt.c:298
+msgid "Cannot write reencryption log file.\n"
+msgstr "Impossible d'écrire le journal de re-chiffrement.\n"
+
+#: src/cryptsetup_reencrypt.c:347
+msgid "Cannot read reencryption log file.\n"
+msgstr "Impossible de lire le journal de re-chiffrement.\n"
+
+#: src/cryptsetup_reencrypt.c:397
+#, c-format
+msgid "Log file %s exists, resuming reencryption.\n"
+msgstr "Fichier journal %s existe. Reprise du re-chiffrement.\n"
+
+#: src/cryptsetup_reencrypt.c:451
+msgid "Activation of temporary devices failed.\n"
+msgstr "Échec de l'activation des périphériques temporaires.\n"
+
+#: src/cryptsetup_reencrypt.c:476
+#, c-format
+msgid "New LUKS header for device %s created.\n"
+msgstr "Nouvel en-tête LUKS créé pour le périphérique %s.\n"
+
+#: src/cryptsetup_reencrypt.c:484
+#, c-format
+msgid "Activated keyslot %i.\n"
+msgstr "Emplacement de clé activé %i.\n"
+
+#: src/cryptsetup_reencrypt.c:508
+#, c-format
+msgid "LUKS header backup of device %s created.\n"
+msgstr "Sauvegarde de l'en-tête LUKS du périphérique %s créée.\n"
+
+#: src/cryptsetup_reencrypt.c:536
+msgid "Creation of LUKS backup headers failed.\n"
+msgstr "La création de la sauvegarde des en-têtes LUKS a échoué.\n"
+
+#: src/cryptsetup_reencrypt.c:631
+#, c-format
+msgid "Cannot restore LUKS header on device %s.\n"
+msgstr "Impossible de rétablir l'en-tête LUKS sur le périphérique %s.\n"
+
+#: src/cryptsetup_reencrypt.c:633
+#, c-format
+msgid "LUKS header on device %s restored.\n"
+msgstr "En-tête LUKS rétabli sur le périphérique %s.\n"
+
+#: src/cryptsetup_reencrypt.c:665
+#, c-format
+msgid "Progress: %5.1f%%, ETA %02llu:%02llu, %4llu MiB written, speed %5.1f MiB/s%s"
+msgstr "Progression: %5.1f%%, ETA %02llu:%02llu, %4llu MiB écrits, vitesse %5.1f MIB/s%s"
+
+#: src/cryptsetup_reencrypt.c:681 src/cryptsetup_reencrypt.c:757
+msgid "Cannot seek to device offset.\n"
+msgstr "Impossible de se déplacer au décalage du périphérique.\n"
+
+#: src/cryptsetup_reencrypt.c:803 src/cryptsetup_reencrypt.c:809
+msgid "Cannot open temporary LUKS header file.\n"
+msgstr "Impossible d'ouvrir le fichier temporaire de l'en-tête LUKS.\n"
+
+#: src/cryptsetup_reencrypt.c:815
+msgid "Cannot get device size.\n"
+msgstr "Impossible d'obtenir la taille du périphérique.\n"
+
+#: src/cryptsetup_reencrypt.c:839
+msgid "Interrupted by a signal.\n"
+msgstr "Interrompu par un signal.\n"
+
+#: src/cryptsetup_reencrypt.c:841
+msgid "IO error during reencryption.\n"
+msgstr "Erreur E/S pendant le re-chiffrement.\n"
+
+#: src/cryptsetup_reencrypt.c:942
+msgid "Key file can be used only with --key-slot or with exactly one key slot active.\n"
+msgstr "Le fichier de clé peut uniquement être utilisé avec --key-slot ou avec exactement un seul emplacement de clé actif.\n"
+
+#: src/cryptsetup_reencrypt.c:984
+msgid "Enter any LUKS passphrase: "
+msgstr "Entrez n'importe quelle phrase secrète LUKS : "
+
+#: src/cryptsetup_reencrypt.c:991
+#, c-format
+msgid "Enter LUKS passphrase for key slot %u: "
+msgstr "Entrez la phrase secrète LUKS pour l'emplacement de clé %u : "
+
+#: src/cryptsetup_reencrypt.c:1040
+msgid "Cannot open reencryption log file.\n"
+msgstr "Impossible d'ouvrir le journal de re-chiffrement.\n"
+
+#: src/cryptsetup_reencrypt.c:1144
+msgid "Reencryption block size"
+msgstr "Taille de bloc de re-chiffrement"
+
+#: src/cryptsetup_reencrypt.c:1144
+msgid "MiB"
+msgstr "MiB"
+
+#: src/cryptsetup_reencrypt.c:1154
+msgid "Use direct-io when accesing devices."
+msgstr "Utilise direct-io pour accéder aux périphériques."
+
+#: src/cryptsetup_reencrypt.c:1155
+msgid "Use fsync after each block."
+msgstr "Utiliser fsync après chaque bloc."
+
+#: src/cryptsetup_reencrypt.c:1156
+msgid "Update log file after every block."
+msgstr "Met le journal à jour après chaque bloc."
+
+#: src/cryptsetup_reencrypt.c:1157
+msgid "Use only this slot (others will be disabled)."
+msgstr "Utiliser uniquement cet emplacement (les autres seront désactivés)."
+
+#: src/cryptsetup_reencrypt.c:1160
+msgid "Reduce data device size (move data offset). DANGEROUS!"
+msgstr "Réduire la taille des données du périphérique (déplace le décalage des données). DANGEREUX !"
+
+#: src/cryptsetup_reencrypt.c:1161
+msgid "Use only specified device size (ignore rest of device). DANGEROUS!"
+msgstr "Utilise uniquement la taille demandée du périphérique (ignore le reste du périphérique). DANGEREUX !"
+
+#: src/cryptsetup_reencrypt.c:1162
+msgid "Create new header on not encrypted device."
+msgstr "Créer un nouvel en-tête sur le périphérique non chiffré."
+
+#: src/cryptsetup_reencrypt.c:1178
+msgid "[OPTION...] <device>"
+msgstr "[OPTION...] <périph>"
+
+#: src/cryptsetup_reencrypt.c:1192
+msgid "WARNING: this is experimental code, it can completely break your data.\n"
+msgstr "ATTENTION : ce code est expérimental. Il peut complètement détruire vos données.\n"
+
+#: src/cryptsetup_reencrypt.c:1193
+#, c-format
+msgid "Reencryption will change: volume key%s%s%s%s.\n"
+msgstr "Le re-chiffrement va changer : clé de volume%s%s%s%s.\n"
+
+#: src/cryptsetup_reencrypt.c:1194
+msgid ", set hash to "
+msgstr ", change hachage en "
+
+#: src/cryptsetup_reencrypt.c:1195
+msgid ", set cipher to "
+msgstr ", change chiffrement en "
+
+#: src/cryptsetup_reencrypt.c:1200
+msgid "Argument required."
+msgstr "Argument requis."
+
+#: src/cryptsetup_reencrypt.c:1216
+msgid "Only values between 1 MiB and 64 MiB allowed for reencryption block size."
+msgstr "Seules les valeurs entre 1 MiB et 64 MiB sont permises pour la taille des blocs de re-chiffrement."
+
+#: src/cryptsetup_reencrypt.c:1235 src/cryptsetup_reencrypt.c:1240
+msgid "Invalid device size specification."
+msgstr "La taille de périphérique spécifiée est invalide."
+
+#: src/cryptsetup_reencrypt.c:1243
+msgid "Maximum device reduce size is 64 MiB."
+msgstr "La taille maximum réduite pour le périphérique est 64 MiB."
+
+#: src/cryptsetup_reencrypt.c:1246
+msgid "Reduce size must be multiple of 512 bytes sector."
+msgstr "La taille réduite doit être un multiple d'un secteur de 512 octets."
+
+#: src/cryptsetup_reencrypt.c:1250
+msgid "Option --new must be used together with --reduce-device-size."
+msgstr "L'option --new doit être utilisée avec --reduce-device-size."
+
+#: src/utils_tools.c:114
+msgid "Command successful.\n"
+msgstr "Opération réussie.\n"
+
+#: src/utils_tools.c:128
+#, c-format
+msgid "Command failed with code %i"
+msgstr "L'opération a échoué avec le code %i"
+
+#~ msgid "Cannot not read %d bytes from key file %s.\n"
+#~ msgstr "Échec à la lecture de %d octets du fichier %s contenant la clé.\n"
+
+#~ msgid "Key slot %d verified.\n"
+#~ msgstr "L'emplacement de clé %d a été vérifié.\n"
+
+#~ msgid "Invalid key size %d.\n"
+#~ msgstr "%d n'est pas une taille de clé valide.\n"
+
+#~ msgid "Device %s is busy.\n"
+#~ msgstr "Le périphérique %s est occupé.\n"
+
+#~ msgid "Cannot open device %s for %s%s access.\n"
+#~ msgstr "Impossible d'ouvrir le périphérique %s pour un accès %s%s.\n"
+
+#~ msgid "exclusive "
+#~ msgstr "exclusif "
+
+#~ msgid "writable"
+#~ msgstr "en écriture"
+
+#~ msgid "read-only"
+#~ msgstr "en lecture seule"
+
+#~ msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
+#~ msgstr "ATTENTION !!! La mémoire n'est peut-être pas sécurisée. Êtes-vous super-utilisateur ?\n"
+
+#~ msgid "Negative keyfile size not permitted.\n"
+#~ msgstr "Taille négative de fichier de clé non autorisée.\n"
+
+#~ msgid "Unable to obtain sector size for %s"
+#~ msgstr "Impossible d'obtenir la taille de secteur de %s"
+
+#~ msgid "Block mode XTS is available since kernel 2.6.24.\n"
+#~ msgstr "Le mode \"bloc\" XTS est disponible depuis le noyau 2.6.24.\n"
+
+#~ msgid "Key size in LRW mode must be 256 or 512 bits.\n"
+#~ msgstr "La taille de la clé en mode LRW doit être un multiple de 256 ou 512 bits.\n"
+
+#~ msgid "Block mode LRW is available since kernel 2.6.20.\n"
+#~ msgstr "Le mode \"bloc\" LRW est disponible depuis le noyau 2.6.20.\n"
+
+#~ msgid "Failed to write to key storage.\n"
+#~ msgstr "Échec lors de l'écriture à l'emplacement de stockage de la clé.\n"
+
+#~ msgid "Failed to read from key storage.\n"
+#~ msgstr "Échec lors de la lecture depuis l'emplacement de stockage de la clé.\n"
 
 #~ msgid "Warning: exhausting read requested, but key file is not a regular file, function might never return.\n"
 #~ msgstr "Attention : requête de lecture, mais le fichier de clef n'est pas régulier, la procédure peut rester bloquée.\n"
@@ -1021,9 +1587,6 @@ msgstr "L'option --offset est utilisable uniquement avec les commandes \"create\
 #~ msgid "Cannot find compatible device-mapper kernel modules.\n"
 #~ msgstr "Impossible de trouver des modules noyau compatibles avec device-mapper.\n"
 
-#~ msgid "Can't do passphrase verification on non-tty inputs.\n"
-#~ msgstr "Impossible de vérifier une phrase secrète non saisie sur une console.\n"
-
 #~ msgid "Cannot open device: %s\n"
 #~ msgstr "Impossible d'ouvrir le périphérique : %s\n"
 
diff --git a/po/pl.po b/po/pl.po
index 8f62f58..f6f1194 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cryptsetup 1.5.0-rc2\n"
+"Project-Id-Version: cryptsetup 1.5.1\n"
 "Report-Msgid-Bugs-To: dm-crypt@saout.de\n"
-"POT-Creation-Date: 2012-06-20 11:31+0200\n"
-"PO-Revision-Date: 2012-06-22 21:39+0200\n"
+"POT-Creation-Date: 2012-09-19 15:48+0200\n"
+"PO-Revision-Date: 2012-10-13 11:41+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -17,11 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: lib/libdevmapper.c:199
+#: lib/libdevmapper.c:230
+msgid "Cannot initialize device-mapper, running as non-root user.\n"
+msgstr "Nie mo�na zainicjowa� device-mappera w czasie dzia�ania jako nie-root.\n"
+
+#: lib/libdevmapper.c:233
 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n"
 msgstr "Nie mo�na zainicjowa� device-mappera. Czy modu� j�dra dm_mod jest wczytany?\n"
 
-#: lib/libdevmapper.c:492
+#: lib/libdevmapper.c:516
 #, c-format
 msgid "DM-UUID for device %s was truncated.\n"
 msgstr "DM-UUID dla urz�dzenia %s zosta� skr�cony.\n"
@@ -52,323 +56,264 @@ msgstr "Nieznane ��danie jako�ci RNG.\n"
 msgid "Error %d reading from RNG: %s\n"
 msgstr "B��d %d podczas odczytu z RNG: %s\n"
 
-#: lib/setup.c:172
+#: lib/setup.c:179
 msgid "Cannot initialize crypto RNG backend.\n"
 msgstr "Nie mo�na zainicjowa� backendu kryptograficznego RNG.\n"
 
-#: lib/setup.c:178
+#: lib/setup.c:185
 msgid "Cannot initialize crypto backend.\n"
 msgstr "Nie mo�na zainicjowa� backendu kryptograficznego.\n"
 
-#: lib/setup.c:201 lib/setup.c:1096 lib/verity/verity.c:119
+#: lib/setup.c:208 lib/setup.c:1060 lib/verity/verity.c:120
 #, c-format
 msgid "Hash algorithm %s not supported.\n"
 msgstr "��dany skr�t skr�tu %s nie jest obs�ugiwany.\n"
 
-#: lib/setup.c:204 lib/loopaes/loopaes.c:88
+#: lib/setup.c:211 lib/loopaes/loopaes.c:88
 #, c-format
 msgid "Key processing error (using hash %s).\n"
 msgstr "B��d przetwarzania klucza (u�yto algorytmu skr�tu %s).\n"
 
-#: lib/setup.c:245
+#: lib/setup.c:252
 msgid "All key slots full.\n"
 msgstr "Wszyskie miejsca na klucze s� pe�ne.\n"
 
-#: lib/setup.c:252
+#: lib/setup.c:259
 #, c-format
 msgid "Key slot %d is invalid, please select between 0 and %d.\n"
 msgstr "Numer klucza %d jest b��dny, prosz� wybra� warto�� mi�dzy 0 a %d.\n"
 
-#: lib/setup.c:258
+#: lib/setup.c:265
 #, c-format
 msgid "Key slot %d is full, please select another one.\n"
 msgstr "Miejsce na klucz %d jest pe�ne, prosz� wybra� inne.\n"
 
-#: lib/setup.c:372
+#: lib/setup.c:379
 #, c-format
 msgid "Enter passphrase for %s: "
 msgstr "Has�o dla %s: "
 
-#: lib/setup.c:521
-msgid "Cannot find a free loopback device.\n"
-msgstr "Nie znaleziono wolnego urz�dzenia loopback.\n"
-
-#: lib/setup.c:528
-msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
-msgstr "Nie uda�o si� pod��czy� urz�dzenia loopback (wymagane urz�dzenie loop z flag� autoclear).\n"
-
-#: lib/setup.c:601
+#: lib/setup.c:560
 #, c-format
 msgid "Header detected but device %s is too small.\n"
 msgstr "Wykryto nag��wek, ale urz�dzenie %s jest zbyt ma�e.\n"
 
-#: lib/setup.c:617 lib/setup.c:1312
+#: lib/setup.c:576 lib/setup.c:1278
 msgid "This operation is not supported for this device type.\n"
 msgstr "Ta operacja nie jest obs�ugiwana dla tego rodzaju urz�dzenia.\n"
 
-#: lib/setup.c:829 lib/setup.c:1276 lib/setup.c:2076
+#: lib/setup.c:782 lib/setup.c:1242 lib/setup.c:2034
 #, c-format
 msgid "Device %s is not active.\n"
 msgstr "Urz�dzenie %s nie jest aktywne.\n"
 
-#: lib/setup.c:846
+#: lib/setup.c:799
 #, c-format
 msgid "Underlying device for crypt device %s disappeared.\n"
 msgstr "Urz�dzenie stoj�ce za urz�dzeniem szyfrowanym %s znik�o.\n"
 
-#: lib/setup.c:909
+#: lib/setup.c:862
 msgid "Invalid plain crypt parameters.\n"
 msgstr "B��dne parametry szyfru plain.\n"
 
-#: lib/setup.c:914 lib/setup.c:1025
+#: lib/setup.c:867 lib/setup.c:989
 msgid "Invalid key size.\n"
 msgstr "B��dny rozmiar klucza.\n"
 
-#: lib/setup.c:958
+#: lib/setup.c:911
 msgid "Can't format LUKS without device.\n"
 msgstr "Nie mo�na sformatowa� LUKS-a bez urz�dzenia.\n"
 
-#: lib/setup.c:999
+#: lib/setup.c:959
 #, c-format
 msgid "Cannot format device %s which is still in use.\n"
 msgstr "Nie mo�na sformatowa� urz�dzenia %s, kt�re jest nadal w u�yciu.\n"
 
-#: lib/setup.c:1002
+#: lib/setup.c:962
+#, c-format
+msgid "Cannot format device %s, permission denied.\n"
+msgstr "Nie mo�na sformatowa� urz�dzenia %s, brak uprawnie�.\n"
+
+#: lib/setup.c:966
 #, c-format
 msgid "Cannot wipe header on device %s.\n"
 msgstr "Nie mo�na wyczy�ci� nag��wka na urz�dzeniu %s.\n"
 
-#: lib/setup.c:1020
+#: lib/setup.c:984
 msgid "Can't format LOOPAES without device.\n"
 msgstr "Nie mo�na sformatowa� urz�dzenia LUKSAES bez urz�dzenia.\n"
 
-#: lib/setup.c:1056
+#: lib/setup.c:1020
 msgid "Can't format VERITY without device.\n"
 msgstr "Nie mo�na sformatowa� VERITY bez urz�dzenia.\n"
 
-#: lib/setup.c:1064 lib/verity/verity.c:102
+#: lib/setup.c:1028 lib/verity/verity.c:103
 #, c-format
 msgid "Unsupported VERITY hash type %d.\n"
 msgstr "Nieobs�ugiwany typ hasza VERITY %d.\n"
 
-#: lib/setup.c:1070 lib/verity/verity.c:110
+#: lib/setup.c:1034 lib/verity/verity.c:111
 msgid "Unsupported VERITY block size.\n"
 msgstr "Nieobs�ugiwany rozmiar bloku VERITY.\n"
 
-#: lib/setup.c:1075 lib/verity/verity.c:73
+#: lib/setup.c:1039 lib/verity/verity.c:74
 msgid "Unsupported VERITY hash offset.\n"
 msgstr "Nieobs�ugiwany offset hasza VERITY.\n"
 
-#: lib/setup.c:1185
+#: lib/setup.c:1151
 #, c-format
 msgid "Unknown crypt device type %s requested.\n"
 msgstr "Nieznany typ ��danego urz�dzenia szyfruj�cego %s.\n"
 
-#: lib/setup.c:1327
+#: lib/setup.c:1293
 msgid "Do you really want to change UUID of device?"
 msgstr "Czy na pewno zmieni� UUID urz�dzenia?"
 
-#: lib/setup.c:1418 lib/setup.c:1465 lib/setup.c:1514 lib/setup.c:1580
-#: lib/setup.c:1656 lib/setup.c:1737 lib/setup.c:1783 lib/setup.c:2141
-#: lib/setup.c:2419
+#: lib/setup.c:1379 lib/setup.c:1424 lib/setup.c:1473 lib/setup.c:1539
+#: lib/setup.c:1615 lib/setup.c:1696 lib/setup.c:1742 lib/setup.c:2099
+#: lib/setup.c:2382
 msgid "This operation is supported only for LUKS device.\n"
 msgstr "Ta operacja jest obs�ugiwana tylko na urz�dzeniach LUKS.\n"
 
-#: lib/setup.c:1425
+#: lib/setup.c:1386
 #, c-format
 msgid "Volume %s is not active.\n"
 msgstr "Wolumen %s nie jest aktywny.\n"
 
-#: lib/setup.c:1437
+#: lib/setup.c:1397
 #, c-format
 msgid "Volume %s is already suspended.\n"
 msgstr "Wolumen %s ju� zosta� zatrzymany.\n"
 
-#: lib/setup.c:1475 lib/setup.c:1524
+#: lib/setup.c:1434 lib/setup.c:1483
 #, c-format
 msgid "Volume %s is not suspended.\n"
 msgstr "Wolumen %s nie jest zatrzymany.\n"
 
-#: lib/setup.c:1531 lib/setup.c:1908 lib/setup.c:1922 src/cryptsetup.c:343
+#: lib/setup.c:1490 lib/setup.c:1867 lib/setup.c:1881 src/cryptsetup.c:194
 msgid "Enter passphrase: "
 msgstr "Has�o: "
 
-#: lib/setup.c:1594 lib/setup.c:1670
+#: lib/setup.c:1553 lib/setup.c:1629
 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n"
 msgstr "Nie mo�na doda� klucza, wszystkie miejsca na klucze wy��czone i nie podano klucza wolumenu.\n"
 
-#: lib/setup.c:1603 lib/setup.c:1676 lib/setup.c:1680
+#: lib/setup.c:1562 lib/setup.c:1635 lib/setup.c:1639
 msgid "Enter any passphrase: "
 msgstr "Dowolne has�o: "
 
-#: lib/setup.c:1620 lib/setup.c:1693 lib/setup.c:1697 lib/setup.c:1760
+#: lib/setup.c:1579 lib/setup.c:1652 lib/setup.c:1656 lib/setup.c:1719
 msgid "Enter new passphrase for key slot: "
 msgstr "Nowe has�o dla klucza: "
 
-#: lib/setup.c:1751 lib/setup.c:2012 lib/setup.c:2025 lib/setup.c:2152
+#: lib/setup.c:1710 lib/setup.c:1971 lib/setup.c:1984 lib/setup.c:2110
 msgid "Volume key does not match the volume.\n"
 msgstr "Klucz wolumenu nie pasuje do wolumenu.\n"
 
-#: lib/setup.c:1789
+#: lib/setup.c:1748
 #, c-format
 msgid "Key slot %d is invalid.\n"
 msgstr "Numer klucza %d jest nieprawid�owy.\n"
 
-#: lib/setup.c:1794
+#: lib/setup.c:1753
 #, c-format
 msgid "Key slot %d is not used.\n"
 msgstr "Klucz %d nie jest u�ywany.\n"
 
-#: lib/setup.c:1824 lib/setup.c:1896 lib/setup.c:1988
+#: lib/setup.c:1783 lib/setup.c:1855 lib/setup.c:1947
 #, c-format
 msgid "Device %s already exists.\n"
 msgstr "Urz�dzenie %s ju� istnieje.\n"
 
-#: lib/setup.c:1999
+#: lib/setup.c:1958
 msgid "Incorrect volume key specified for plain device.\n"
 msgstr "Podano niew�a�ciwy klucz wolumenu dla zwyk�ego urz�dzenia.\n"
 
-#: lib/setup.c:2032
+#: lib/setup.c:1991
 msgid "Incorrect root hash specified for verity device.\n"
 msgstr "Podano niew�a�ciwy hasz g��wny dla urz�dzenia VERITY.\n"
 
-#: lib/setup.c:2051
+#: lib/setup.c:2009
 msgid "Device type is not properly initialised.\n"
 msgstr "Typ urz�dzenia nie zosta� w�a�ciwie zainicjalizowany.\n"
 
-#: lib/setup.c:2080
+#: lib/setup.c:2038
 #, c-format
 msgid "Invalid device %s.\n"
 msgstr "B��dne urz�dzenie %s.\n"
 
-#: lib/setup.c:2108
+#: lib/setup.c:2066
 msgid "Volume key buffer too small.\n"
 msgstr "Bufor klucza wolumenu zbyt ma�y.\n"
 
-#: lib/setup.c:2116
+#: lib/setup.c:2074
 msgid "Cannot retrieve volume key for plain device.\n"
 msgstr "Nie mo�na odtworzy� klucza wolumenu dla zwyk�ego urz�dzenia.\n"
 
-#: lib/setup.c:2122
+#: lib/setup.c:2080
 #, c-format
 msgid "This operation is not supported for %s crypt device.\n"
 msgstr "Ta operacja nie jest obs�ugiwana dla urz�dzenia szyfruj�cego %s.\n"
 
-#: lib/setup.c:2317
+#: lib/setup.c:2275
 msgid "Dump operation is not supported for this device type.\n"
 msgstr "Operacja zrzutu nie jest obs�ugiwana dla tego rodzaju urz�dzenia.\n"
 
-#: lib/utils.c:275
-#, c-format
-msgid "Device %s doesn't exist or access denied.\n"
-msgstr "Urz�dzenie %s nie istnieje lub dost�p jest zabroniony.\n"
-
-#: lib/utils.c:285
-#, c-format
-msgid "Cannot open device %s for %s%s access.\n"
-msgstr "Nie mo�na otworzy� urz�dzenia %s do %sdost�pu %s.\n"
-
-#: lib/utils.c:286
-msgid "exclusive "
-msgstr "wy��cznego "
-
-#: lib/utils.c:287
-msgid "writable"
-msgstr "do zapisu"
-
-#: lib/utils.c:287
-msgid "read-only"
-msgstr "tylko do odczytu"
-
-#: lib/utils.c:294 src/cryptsetup_reencrypt.c:241
-#, c-format
-msgid "Cannot read device %s.\n"
-msgstr "Nie mo�na odczyta� urz�dzenia %s.\n"
-
-#: lib/utils.c:391
-#, c-format
-msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
-msgstr "Nie mo�na u�y� urz�dzenia %s, kt�re jest w u�yciu (ju� podmapowane lub zamontowane).\n"
-
-#: lib/utils.c:395
-#, c-format
-msgid "Cannot get info about device %s.\n"
-msgstr "Nie mo�na uzyska� informacji o urz�dzeniu %s.\n"
-
-#: lib/utils.c:401
-#, c-format
-msgid "Requested offset is beyond real size of device %s.\n"
-msgstr "��dany offset jest poza rzeczywistym rozmiarem urz�dzenia %s.\n"
-
-#: lib/utils.c:409
-#, c-format
-msgid "Device %s has zero size.\n"
-msgstr "Urz�dzenie %s ma zerowy rozmiar.\n"
-
-#: lib/utils.c:420 lib/luks1/keymanage.c:85
-#, c-format
-msgid "Device %s is too small.\n"
-msgstr "Urz�dzenie %s jest zbyt ma�e.\n"
-
-#: lib/utils.c:444
-msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
-msgstr "UWAGA! Pami�� mo�e nie by� bezpieczna. Czy jeste� rootem?\n"
-
-#: lib/utils.c:450
+#: lib/utils.c:238
 msgid "Cannot get process priority.\n"
 msgstr "Nie mo�na odczyta� priorytetu procesu.\n"
 
-#: lib/utils.c:453 lib/utils.c:466
+#: lib/utils.c:241 lib/utils.c:254
 #, c-format
 msgid "setpriority %d failed: %s\n"
 msgstr "setpriority %d nie powiod�o si�: %s\n"
 
-#: lib/utils.c:464
+#: lib/utils.c:252
 msgid "Cannot unlock memory.\n"
 msgstr "Nie mo�na odblokowa� pami�ci.\n"
 
-#: lib/utils_crypt.c:221 lib/utils_crypt.c:234 lib/utils_crypt.c:338
-#: lib/utils_crypt.c:354
+#: lib/utils_crypt.c:225 lib/utils_crypt.c:238 lib/utils_crypt.c:385
+#: lib/utils_crypt.c:400
 msgid "Out of memory while reading passphrase.\n"
 msgstr "Brak pami�ci podczas odczytu has�a.\n"
 
-#: lib/utils_crypt.c:226 lib/utils_crypt.c:241
+#: lib/utils_crypt.c:230 lib/utils_crypt.c:245
 msgid "Error reading passphrase from terminal.\n"
 msgstr "B��d podczas odczytu has�a z terminala.\n"
 
-#: lib/utils_crypt.c:239
+#: lib/utils_crypt.c:243
 msgid "Verify passphrase: "
 msgstr "Weryfikacja has�a: "
 
-#: lib/utils_crypt.c:246
+#: lib/utils_crypt.c:250
 msgid "Passphrases do not match.\n"
 msgstr "Has�a nie zgadzaj� si�.\n"
 
-#: lib/utils_crypt.c:287
+#: lib/utils_crypt.c:334
 msgid "Cannot use offset with terminal input.\n"
 msgstr "Nie mo�na u�y� offsetu, je�li wej�ciem jest terminal.\n"
 
-#: lib/utils_crypt.c:306
+#: lib/utils_crypt.c:353
 msgid "Failed to open key file.\n"
 msgstr "Nie uda�o si� otworzy� pliku klucza.\n"
 
-#: lib/utils_crypt.c:315
+#: lib/utils_crypt.c:362
 msgid "Failed to stat key file.\n"
 msgstr "Nie uda�o si� wykona� stat na pliku klucza.\n"
 
-#: lib/utils_crypt.c:323 lib/utils_crypt.c:345
+#: lib/utils_crypt.c:370 lib/utils_crypt.c:391
 msgid "Cannot seek to requested keyfile offset.\n"
 msgstr "Nie mo�na przemie�ci� si� do ��danego po�o�enia pliku klucza.\n"
 
-#: lib/utils_crypt.c:362
+#: lib/utils_crypt.c:408
 msgid "Error reading passphrase.\n"
 msgstr "B��d podczas odczytu has�a.\n"
 
-#: lib/utils_crypt.c:380
+#: lib/utils_crypt.c:426
 msgid "Maximum keyfile size exceeded.\n"
 msgstr "Przekroczono maksymalny rozmiar pliku klucza.\n"
 
-#: lib/utils_crypt.c:385
+#: lib/utils_crypt.c:431
 msgid "Cannot read requested amount of data.\n"
 msgstr "Nie mo�na odczyta� ��danej ilo�ci danych.\n"
 
@@ -380,20 +325,71 @@ msgstr "Weryfikacja sumy kontrolnej FIPS nie powiod�a si�.\n"
 msgid "Running in FIPS mode.\n"
 msgstr "Dzia�anie w trybie FIPS.\n"
 
-#: lib/luks1/keyencryption.c:82
+#: lib/utils_device.c:48
+#, c-format
+msgid "Device %s doesn't exist or access denied.\n"
+msgstr "Urz�dzenie %s nie istnieje lub dost�p jest zabroniony.\n"
+
+#: lib/utils_device.c:58 lib/luks1/keymanage.c:298 lib/luks1/keymanage.c:527
+#: lib/luks1/keymanage.c:567 lib/verity/verity.c:80 lib/verity/verity.c:174
+#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:304
+#: lib/verity/verity_hash.c:324
+#, c-format
+msgid "Cannot open device %s.\n"
+msgstr "Nie mo�na otworzy� urz�dzenia %s.\n"
+
+#: lib/utils_device.c:333
+msgid "Cannot use a loopback device, running as non-root user.\n"
+msgstr "Nie mo�na u�y� urz�dzenia loopback w czasie dzia�ania jako nie-root.\n"
+
+#: lib/utils_device.c:336
+msgid "Cannot find a free loopback device.\n"
+msgstr "Nie znaleziono wolnego urz�dzenia loopback.\n"
+
+#: lib/utils_device.c:343
+msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
+msgstr "Nie uda�o si� pod��czy� urz�dzenia loopback (wymagane urz�dzenie loop z flag� autoclear).\n"
+
+#: lib/utils_device.c:383
+#, c-format
+msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
+msgstr "Nie mo�na u�y� urz�dzenia %s, kt�re jest w u�yciu (ju� podmapowane lub zamontowane).\n"
+
+#: lib/utils_device.c:387
+#, c-format
+msgid "Cannot get info about device %s.\n"
+msgstr "Nie mo�na uzyska� informacji o urz�dzeniu %s.\n"
+
+#: lib/utils_device.c:393
+#, c-format
+msgid "Requested offset is beyond real size of device %s.\n"
+msgstr "��dany offset jest poza rzeczywistym rozmiarem urz�dzenia %s.\n"
+
+#: lib/utils_device.c:401
 #, c-format
-msgid "Unable to obtain sector size for %s"
-msgstr "Nie uda�o si� uzyska� rozmiaru sektora dla %s"
+msgid "Device %s has zero size.\n"
+msgstr "Urz�dzenie %s ma zerowy rozmiar.\n"
 
-#: lib/luks1/keyencryption.c:109
+#: lib/utils_device.c:412 lib/luks1/keymanage.c:89
+#, c-format
+msgid "Device %s is too small.\n"
+msgstr "Urz�dzenie %s jest zbyt ma�e.\n"
+
+#: lib/luks1/keyencryption.c:66 lib/luks1/keymanage.c:295
+#: lib/luks1/keymanage.c:564 lib/luks1/keymanage.c:981
+#, c-format
+msgid "Cannot write to device %s, permission denied.\n"
+msgstr "Nie mo�na zapisa� na urz�dzenie %s, brak uprawnie�.\n"
+
+#: lib/luks1/keyencryption.c:91
 msgid "Key size in XTS mode must be 256 or 512 bits.\n"
 msgstr "Rozmiar klucza w trybie XTS musi wynosi� 256 lub 512 bit�w.\n"
 
-#: lib/luks1/keyencryption.c:132
+#: lib/luks1/keyencryption.c:117
 msgid "Failed to obtain device mapper directory."
 msgstr "Nie uda�o si� uzyska� katalogu device mappera."
 
-#: lib/luks1/keyencryption.c:148
+#: lib/luks1/keyencryption.c:133
 #, c-format
 msgid ""
 "Failed to setup dm-crypt key mapping for device %s.\n"
@@ -404,67 +400,67 @@ msgstr ""
 "Prosz� sprawdzi�, czy j�dro obs�uguje szyfr %s (wi�cej informacji w syslogu).\n"
 "%s"
 
-#: lib/luks1/keyencryption.c:158
+#: lib/luks1/keyencryption.c:143
 msgid "Failed to open temporary keystore device.\n"
 msgstr "Nie uda�o si� otworzy� urz�dzenia do tymczasowego przechowywania kluczy.\n"
 
-#: lib/luks1/keyencryption.c:165
+#: lib/luks1/keyencryption.c:150
 msgid "Failed to access temporary keystore device.\n"
 msgstr "Nie uda�o si� uzyska� dost�pu do urz�dzenia do tymczasowego przechowywania kluczy.\n"
 
-#: lib/luks1/keymanage.c:157
+#: lib/luks1/keymanage.c:161
 #, c-format
 msgid "Requested file %s already exist.\n"
 msgstr "��dany plik %s ju� istnieje.\n"
 
-#: lib/luks1/keymanage.c:177 lib/luks1/keymanage.c:408
-#: src/cryptsetup_reencrypt.c:1062
+#: lib/luks1/keymanage.c:181 lib/luks1/keymanage.c:417
+#: src/cryptsetup_reencrypt.c:1014
 #, c-format
 msgid "Device %s is not a valid LUKS device.\n"
 msgstr "Urz�dzenie %s nie jest prawid�owym urz�dzeniem LUKS.\n"
 
-#: lib/luks1/keymanage.c:197
+#: lib/luks1/keymanage.c:202
 #, c-format
 msgid "Cannot write header backup file %s.\n"
 msgstr "Nie mo�na zapisa� pliku kopii zapasowej nag��wka %s.\n"
 
-#: lib/luks1/keymanage.c:224
+#: lib/luks1/keymanage.c:229
 #, c-format
 msgid "Backup file %s doesn't exist.\n"
 msgstr "Plik kopii zapasowej %s nie istnieje.\n"
 
-#: lib/luks1/keymanage.c:233
+#: lib/luks1/keymanage.c:238
 msgid "Backup file doesn't contain valid LUKS header.\n"
 msgstr "Plik kopii zapasowej nie zawiera prawid�owego nag��wka LUKS.\n"
 
-#: lib/luks1/keymanage.c:246
+#: lib/luks1/keymanage.c:251
 #, c-format
 msgid "Cannot open header backup file %s.\n"
 msgstr "Nie mo�na otworzy� pliku kopii zapasowej nag��wka %s.\n"
 
-#: lib/luks1/keymanage.c:252
+#: lib/luks1/keymanage.c:257
 #, c-format
 msgid "Cannot read header backup file %s.\n"
 msgstr "Nie mo�na odczyta� pliku kopii zapasowej nag��wka %s.\n"
 
-#: lib/luks1/keymanage.c:263
+#: lib/luks1/keymanage.c:268
 msgid "Data offset or key size differs on device and backup, restore failed.\n"
 msgstr "Offset danych lub rozmiar klucza r�ni� si� mi�dzy urz�dzeniem a kopi� zapasow�; przywr�cenie nie powiod�o si�.\n"
 
-#: lib/luks1/keymanage.c:271
+#: lib/luks1/keymanage.c:276
 #, c-format
 msgid "Device %s %s%s"
 msgstr "Urz�dzenie %s %s%s"
 
-#: lib/luks1/keymanage.c:272
+#: lib/luks1/keymanage.c:277
 msgid "does not contain LUKS header. Replacing header can destroy data on that device."
 msgstr "nie zawiera nag��wka LUKS. Nadpisanie nag��wka mo�e zniszczy� dane na tym urz�dzeniu."
 
-#: lib/luks1/keymanage.c:273
+#: lib/luks1/keymanage.c:278
 msgid "already contains LUKS header. Replacing header will destroy existing keyslots."
 msgstr "ju� zawiera nag��wek LUKS. Nadpisanie nag��wka zniszczy istniej�ce klucze."
 
-#: lib/luks1/keymanage.c:274
+#: lib/luks1/keymanage.c:279
 msgid ""
 "\n"
 "WARNING: real device header has different UUID than backup!"
@@ -472,140 +468,124 @@ msgstr ""
 "\n"
 "UWAGA: nag��wek prawdziwego urz�dzenia ma inny UUID ni� kopia zapasowa!"
 
-#: lib/luks1/keymanage.c:289 lib/luks1/keymanage.c:513
-#: lib/luks1/keymanage.c:549 lib/verity/verity.c:79 lib/verity/verity.c:172
-#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:302
-#: lib/verity/verity_hash.c:321
-#, c-format
-msgid "Cannot open device %s.\n"
-msgstr "Nie mo�na otworzy� urz�dzenia %s.\n"
-
-#: lib/luks1/keymanage.c:319
+#: lib/luks1/keymanage.c:328
 msgid "Non standard key size, manual repair required.\n"
 msgstr "Niestandardowy rozmiar klucza, wymagana r�czna naprawa.\n"
 
-#: lib/luks1/keymanage.c:324
+#: lib/luks1/keymanage.c:333
 msgid "Non standard keyslots alignment, manual repair required.\n"
 msgstr "Niestandardowe wyr�wnanie kluczy, wymagana r�czna naprawa.\n"
 
-#: lib/luks1/keymanage.c:330
+#: lib/luks1/keymanage.c:339
 msgid "Repairing keyslots.\n"
 msgstr "Naprawianie kluczy.\n"
 
-#: lib/luks1/keymanage.c:341
+#: lib/luks1/keymanage.c:350
 msgid "Repair failed."
 msgstr "Naprawa nie powiod�a si�."
 
-#: lib/luks1/keymanage.c:353
+#: lib/luks1/keymanage.c:362
 #, c-format
 msgid "Keyslot %i: offset repaired (%u -> %u).\n"
 msgstr "Klucz %i: naprawiono offset (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:361
+#: lib/luks1/keymanage.c:370
 #, c-format
 msgid "Keyslot %i: stripes repaired (%u -> %u).\n"
 msgstr "Klucz %i: naprawiono pasy (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:370
+#: lib/luks1/keymanage.c:379
 #, c-format
 msgid "Keyslot %i: bogus partition signature.\n"
 msgstr "Klucz %i: b��dna sygnatura partycji.\n"
 
-#: lib/luks1/keymanage.c:375
+#: lib/luks1/keymanage.c:384
 #, c-format
 msgid "Keyslot %i: salt wiped.\n"
 msgstr "Klucz %i: zarodek wyczyszczony.\n"
 
-#: lib/luks1/keymanage.c:386
+#: lib/luks1/keymanage.c:395
 msgid "Writing LUKS header to disk.\n"
 msgstr "Zapis nag��wka LUKS na dysk.\n"
 
-#: lib/luks1/keymanage.c:411
+#: lib/luks1/keymanage.c:420
 #, c-format
 msgid "Unsupported LUKS version %d.\n"
 msgstr "Nieobs�ugiwana wersja LUKS %d.\n"
 
-#: lib/luks1/keymanage.c:417 lib/luks1/keymanage.c:621
+#: lib/luks1/keymanage.c:426 lib/luks1/keymanage.c:639
 #, c-format
 msgid "Requested LUKS hash %s is not supported.\n"
 msgstr "��dany skr�t LUKS %s nie jest obs�ugiwany.\n"
 
-#: lib/luks1/keymanage.c:432
+#: lib/luks1/keymanage.c:441
 #, c-format
 msgid "LUKS keyslot %u is invalid.\n"
 msgstr "Numer klucza LUKS %u jest nieprawid�owy.\n"
 
-#: lib/luks1/keymanage.c:446 src/cryptsetup.c:537
+#: lib/luks1/keymanage.c:455 src/cryptsetup.c:388
 msgid "No known problems detected for LUKS header.\n"
 msgstr "W nag��wku LUKS nie wykryto �adnych znanych problem�w.\n"
 
-#: lib/luks1/keymanage.c:480
+#: lib/luks1/keymanage.c:488
 #, c-format
 msgid "Cannot open file %s.\n"
 msgstr "Nie mo�na otworzy� pliku %s.\n"
 
-#: lib/luks1/keymanage.c:570
+#: lib/luks1/keymanage.c:588
 #, c-format
 msgid "Error during update of LUKS header on device %s.\n"
 msgstr "B��d podczas uaktualniania nag��wka LUKS na urz�dzeniu %s.\n"
 
-#: lib/luks1/keymanage.c:577
+#: lib/luks1/keymanage.c:595
 #, c-format
 msgid "Error re-reading LUKS header after update on device %s.\n"
 msgstr "B��d podczas ponownego odczytu nag��wka LUKS po uaktualnieniu na urz�dzeniu %s.\n"
 
-#: lib/luks1/keymanage.c:589
+#: lib/luks1/keymanage.c:608
 #, c-format
 msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n"
 msgstr "Niekompatybilne opcje PBKDF2 (przy u�yciu algorytmu skr�tu %s).\n"
 
-#: lib/luks1/keymanage.c:626 lib/luks1/keymanage.c:708
+#: lib/luks1/keymanage.c:644 lib/luks1/keymanage.c:726
 msgid "Wrong LUKS UUID format provided.\n"
 msgstr "Podano z�y format LUKS UUID.\n"
 
-#: lib/luks1/keymanage.c:651
+#: lib/luks1/keymanage.c:669
 msgid "Cannot create LUKS header: reading random salt failed.\n"
 msgstr "Nie mo�na utworzy� nag��wka LUKS: odczyt losowego zarodka nie powi�d� si�.\n"
 
-#: lib/luks1/keymanage.c:668
+#: lib/luks1/keymanage.c:686
 #, c-format
 msgid "Cannot create LUKS header: header digest failed (using hash %s).\n"
 msgstr "Nie mo�na utworzy� nag��wka LUKS: uzyskanie skr�tu nag��wka nie powiod�o si� (przy u�yciu algorytmu %s).\n"
 
-#: lib/luks1/keymanage.c:733
+#: lib/luks1/keymanage.c:751
 #, c-format
 msgid "Key slot %d active, purge first.\n"
 msgstr "Klucz numer %d jest aktywny, nale�y go najpierw wyczy�ci�.\n"
 
-#: lib/luks1/keymanage.c:738
+#: lib/luks1/keymanage.c:757
 #, c-format
 msgid "Key slot %d material includes too few stripes. Header manipulation?\n"
 msgstr "Klucz %d zawiera zbyt ma�o pas�w. Zmieniony nag��wek?\n"
 
-#: lib/luks1/keymanage.c:805
-msgid "Failed to write to key storage.\n"
-msgstr "Nie uda�o si� zapisa� klucza.\n"
-
-#: lib/luks1/keymanage.c:890
-msgid "Failed to read from key storage.\n"
-msgstr "Nie uda�o si� odczyta� klucza.\n"
-
-#: lib/luks1/keymanage.c:900
+#: lib/luks1/keymanage.c:914
 #, c-format
 msgid "Key slot %d unlocked.\n"
 msgstr "Klucz numer %d odblokowany.\n"
 
-#: lib/luks1/keymanage.c:936 src/cryptsetup.c:736 src/cryptsetup.c:920
-#: src/cryptsetup_reencrypt.c:966 src/cryptsetup_reencrypt.c:1000
+#: lib/luks1/keymanage.c:949 src/cryptsetup.c:587 src/cryptsetup.c:771
+#: src/cryptsetup_reencrypt.c:918 src/cryptsetup_reencrypt.c:952
 msgid "No key available with this passphrase.\n"
 msgstr "Dla tego has�a nie ma dost�pnego klucza.\n"
 
-#: lib/luks1/keymanage.c:954
+#: lib/luks1/keymanage.c:967
 #, c-format
 msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n"
 msgstr "Numer klucza %d jest b��dny, prosz� wybra� numer od 0 do %d.\n"
 
-#: lib/luks1/keymanage.c:968
+#: lib/luks1/keymanage.c:985
 #, c-format
 msgid "Cannot wipe device %s.\n"
 msgstr "Nie mo�na wyczy�ci� urz�dzenia %s.\n"
@@ -622,42 +602,42 @@ msgstr "Prosz� u�y� gpg --decrypt <PLIK-KLUCZA> | cryptsetup --keyfile=- ...\n"
 msgid "Incompatible loop-AES keyfile detected.\n"
 msgstr "Wykryto niekompatybilny plik klucza loop-AES.\n"
 
-#: lib/loopaes/loopaes.c:231
+#: lib/loopaes/loopaes.c:230
 msgid "Kernel doesn't support loop-AES compatible mapping.\n"
 msgstr "J�dro nie obs�uguje odwzorowa� zgodnych z loop-AES.\n"
 
-#: lib/verity/verity.c:68 lib/verity/verity.c:166
+#: lib/verity/verity.c:69 lib/verity/verity.c:168
 msgid "Verity device doesn't use on-disk header.\n"
 msgstr "Urz�dzenie VERITY nie u�ywa nag��wka na dysku.\n"
 
-#: lib/verity/verity.c:91
+#: lib/verity/verity.c:92
 #, c-format
 msgid "Device %s is not a valid VERITY device.\n"
 msgstr "Urz�dzenie %s nie jest prawid�owym urz�dzeniem VERITY.\n"
 
-#: lib/verity/verity.c:97
+#: lib/verity/verity.c:98
 #, c-format
 msgid "Unsupported VERITY version %d.\n"
 msgstr "Nieobs�ugiwana wersja VERITY %d.\n"
 
-#: lib/verity/verity.c:127
+#: lib/verity/verity.c:128
 msgid "VERITY header corrupted.\n"
 msgstr "Uszkodzony nag��wek VERITY.\n"
 
-#: lib/verity/verity.c:161
+#: lib/verity/verity.c:163
 msgid "Wrong VERITY UUID format provided.\n"
 msgstr "Podano z�y format UUID-a VERITY.\n"
 
-#: lib/verity/verity.c:189
+#: lib/verity/verity.c:191
 #, c-format
 msgid "Error during update of verity header on device %s.\n"
 msgstr "B��d podczas uaktualniania nag��wka VERITY na urz�dzeniu %s.\n"
 
-#: lib/verity/verity.c:265
+#: lib/verity/verity.c:270
 msgid "Kernel doesn't support dm-verity mapping.\n"
 msgstr "J�dro nie obs�uguje odwzorowa� dm-verity.\n"
 
-#: lib/verity/verity.c:276
+#: lib/verity/verity.c:281
 msgid "Verity device detected corruption after activation.\n"
 msgstr "Urz�dzenie VERITY wykry�o uszkodzenie po uaktywnieniu.\n"
 
@@ -666,7 +646,7 @@ msgstr "Urz�dzenie VERITY wykry�o uszkodzenie po uaktywnieniu.\n"
 msgid "Spare area is not zeroed at position %<PRIu64>.\n"
 msgstr "Nie wyzerowane miejsce zapasowe na pozycji %<PRIu64>.\n"
 
-#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:247
+#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:248
 #: lib/verity/verity_hash.c:278 lib/verity/verity_hash.c:285
 msgid "Device offset overflow.\n"
 msgstr "Przepe�nienie offsetu urz�dzenia.\n"
@@ -676,27 +656,27 @@ msgstr "Przepe�nienie offsetu urz�dzenia.\n"
 msgid "Verification failed at position %<PRIu64>.\n"
 msgstr "Weryfikacja nie powiod�a si� na pozycji %<PRIu64>.\n"
 
-#: lib/verity/verity_hash.c:233
+#: lib/verity/verity_hash.c:234
 msgid "Invalid size parameters for verity device.\n"
 msgstr "B��dne parametry rozmiaru dla urz�dzenia VERITY.\n"
 
-#: lib/verity/verity_hash.c:265
+#: lib/verity/verity_hash.c:266
 msgid "Too many tree levels for verity volume.\n"
 msgstr "Za du�o poziom�w drzewa dla wolumenu VERITY.\n"
 
-#: lib/verity/verity_hash.c:351
+#: lib/verity/verity_hash.c:355
 msgid "Verification of data area failed.\n"
 msgstr "Weryfikacja obszaru danych nie powiod�a si�.\n"
 
-#: lib/verity/verity_hash.c:356
+#: lib/verity/verity_hash.c:360
 msgid "Verification of root hash failed.\n"
 msgstr "Weryfikacja g��wnego hasza nie powiod�a si�.\n"
 
-#: lib/verity/verity_hash.c:362
+#: lib/verity/verity_hash.c:366
 msgid "Input/output error while creating hash area.\n"
 msgstr "B��d wej�cia/wyj�cia podczas tworzenia obszaru haszy.\n"
 
-#: lib/verity/verity_hash.c:364
+#: lib/verity/verity_hash.c:368
 msgid "Creation of hash area failed.\n"
 msgstr "Tworzenie obszaru haszy nie powiod�o si�.\n"
 
@@ -705,215 +685,206 @@ msgstr "Tworzenie obszaru haszy nie powiod�o si�.\n"
 msgid "WARNING: Kernel cannot activate device if data block size exceeds page size (%u).\n"
 msgstr "UWAGA: J�dro nie mo�e uaktywni� urz�dzenia, je�li rozmiar bloku danych przekracza rozmiar strony (%u).\n"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "<name> <device>"
 msgstr "<nazwa> <urz�dzenie>"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "create device"
 msgstr "utworzenie urz�dzenia"
 
-#: src/cryptsetup.c:106 src/cryptsetup.c:107 src/cryptsetup.c:108
-#: src/cryptsetup.c:118 src/cryptsetup.c:125 src/veritysetup.c:385
-#: src/veritysetup.c:386
+#: src/cryptsetup.c:89 src/cryptsetup.c:90 src/cryptsetup.c:91
+#: src/cryptsetup.c:101 src/cryptsetup.c:108 src/veritysetup.c:311
+#: src/veritysetup.c:312
 msgid "<name>"
 msgstr "<nazwa>"
 
-#: src/cryptsetup.c:106
+#: src/cryptsetup.c:89
 msgid "remove device"
 msgstr "usuni�cie urz�dzenia"
 
-#: src/cryptsetup.c:107
+#: src/cryptsetup.c:90
 msgid "resize active device"
 msgstr "zmiana rozmiaru aktywnego urz�dzenia"
 
-#: src/cryptsetup.c:108
+#: src/cryptsetup.c:91
 msgid "show device status"
 msgstr "pokazanie stanu urz�dzenia"
 
-#: src/cryptsetup.c:109 src/cryptsetup.c:116 src/cryptsetup.c:117
-#: src/cryptsetup.c:119 src/cryptsetup.c:120 src/cryptsetup.c:121
-#: src/cryptsetup.c:122 src/cryptsetup.c:123
+#: src/cryptsetup.c:92 src/cryptsetup.c:99 src/cryptsetup.c:100
+#: src/cryptsetup.c:102 src/cryptsetup.c:103 src/cryptsetup.c:104
+#: src/cryptsetup.c:105 src/cryptsetup.c:106
 msgid "<device>"
 msgstr "<urz�dzenie>"
 
-#: src/cryptsetup.c:109
+#: src/cryptsetup.c:92
 msgid "try to repair on-disk metadata"
 msgstr "pr�ba naprawy metadanych na dysku"
 
-#: src/cryptsetup.c:110 src/cryptsetup.c:112
+#: src/cryptsetup.c:93 src/cryptsetup.c:95
 msgid "<device> [<new key file>]"
 msgstr "<urz�dzenie> [<nowy plik klucza>]"
 
-#: src/cryptsetup.c:110
+#: src/cryptsetup.c:93
 msgid "formats a LUKS device"
 msgstr "sformatowanie urz�dzenia LUKS"
 
-#: src/cryptsetup.c:111 src/cryptsetup.c:124
+#: src/cryptsetup.c:94 src/cryptsetup.c:107
 msgid "<device> <name> "
 msgstr "<uz�dzenie> <nazwa> "
 
-#: src/cryptsetup.c:111
+#: src/cryptsetup.c:94
 msgid "open LUKS device as mapping <name>"
 msgstr "otwarcie urz�dzenia LUKS jako odwzorowania <nazwa>"
 
-#: src/cryptsetup.c:112
+#: src/cryptsetup.c:95
 msgid "add key to LUKS device"
 msgstr "dodanie klucza do urz�dzenia LUKS"
 
-#: src/cryptsetup.c:113 src/cryptsetup.c:114
+#: src/cryptsetup.c:96 src/cryptsetup.c:97
 msgid "<device> [<key file>]"
 msgstr "<urz�dzenie> [<plik klucza>]"
 
-#: src/cryptsetup.c:113
+#: src/cryptsetup.c:96
 msgid "removes supplied key or key file from LUKS device"
 msgstr "usuni�cie podanego klucza lub pliku klucza z urz�dzenia LUKS"
 
-#: src/cryptsetup.c:114
+#: src/cryptsetup.c:97
 msgid "changes supplied key or key file of LUKS device"
 msgstr "zmiana podanego klucza lub pliku klucza urz�dzenia LUKS"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "<device> <key slot>"
 msgstr "<urz�dzenie> <numer klucza>"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "wipes key with number <key slot> from LUKS device"
 msgstr "wyczyszczenie klucza o numerze <numer klucza> z urz�dzenia LUKS"
 
-#: src/cryptsetup.c:116
+#: src/cryptsetup.c:99
 msgid "print UUID of LUKS device"
 msgstr "wypisanie UUID-a urz�dzenia LUKS"
 
-#: src/cryptsetup.c:117
+#: src/cryptsetup.c:100
 msgid "tests <device> for LUKS partition header"
 msgstr "sprawdzenie <urz�dzenia> pod k�tem nag��wka partycji LUKS"
 
-#: src/cryptsetup.c:118
+#: src/cryptsetup.c:101
 msgid "remove LUKS mapping"
 msgstr "usuni�cie odwzorowania LUKS"
 
-#: src/cryptsetup.c:119
+#: src/cryptsetup.c:102
 msgid "dump LUKS partition information"
 msgstr "zrzut informacji o partycji LUKS"
 
-#: src/cryptsetup.c:120
+#: src/cryptsetup.c:103
 msgid "Suspend LUKS device and wipe key (all IOs are frozen)."
 msgstr "Zatrzymanie urz�dzenia LUKS i wyczyszczenie klucza (zamra�a wszystkie operacje we/wy)."
 
-#: src/cryptsetup.c:121
+#: src/cryptsetup.c:104
 msgid "Resume suspended LUKS device."
 msgstr "Wznowienie zatrzymanego urz�dzenia LUKS."
 
-#: src/cryptsetup.c:122
+#: src/cryptsetup.c:105
 msgid "Backup LUKS device header and keyslots"
 msgstr "Kopia zapasowa nag��wka i kluczy urz�dzenia LUKS"
 
-#: src/cryptsetup.c:123
+#: src/cryptsetup.c:106
 msgid "Restore LUKS device header and keyslots"
 msgstr "Odtworzenie nag��wka i kluczy urz�dzenia LUKS z kopii zapasowej"
 
-#: src/cryptsetup.c:124
+#: src/cryptsetup.c:107
 msgid "open loop-AES device as mapping <name>"
 msgstr "otwarcie urz�dzenia loop-AES jako odwzorowania <nazwa>"
 
-#: src/cryptsetup.c:125
+#: src/cryptsetup.c:108
 msgid "remove loop-AES mapping"
 msgstr "usuni�cie odwzorowania loop-AES"
 
-#: src/cryptsetup.c:218
+#: src/cryptsetup.c:123
 msgid "Can't do passphrase verification on non-tty inputs.\n"
 msgstr "Nie mo�na wykona� weryfikacji has�a, je�li wej�ciem nie jest terminal.\n"
 
-#: src/cryptsetup.c:233 src/veritysetup.c:432
-msgid "Command successful.\n"
-msgstr "Polecenie si� powiod�o.\n"
-
-#: src/cryptsetup.c:247 src/veritysetup.c:446
-#, c-format
-msgid "Command failed with code %i"
-msgstr "Polecenie nie powiod�o si� z kodem %i"
-
-#: src/cryptsetup.c:375
+#: src/cryptsetup.c:226
 msgid "Option --key-file is required.\n"
 msgstr "Wymagana jest opcja --key-file.\n"
 
-#: src/cryptsetup.c:541
+#: src/cryptsetup.c:392
 msgid "Really try to repair LUKS device header?"
 msgstr "Naprawd� pr�bowa� naprawi� nag��wek urz�dzenia LUKS?"
 
-#: src/cryptsetup.c:566
+#: src/cryptsetup.c:417
 #, c-format
 msgid "This will overwrite data on %s irrevocably."
 msgstr "To nieodwo�alnie nadpisze dane na %s."
 
-#: src/cryptsetup.c:568
+#: src/cryptsetup.c:419
 msgid "memory allocation error in action_luksFormat"
 msgstr "b��d przydzielania pami�ci w action_luksFormat"
 
-#: src/cryptsetup.c:580 src/cryptsetup_reencrypt.c:576
-#: src/cryptsetup_reencrypt.c:611
+#: src/cryptsetup.c:431 src/cryptsetup_reencrypt.c:522
+#: src/cryptsetup_reencrypt.c:557
 msgid "No known cipher specification pattern detected.\n"
 msgstr "Nie wykryto znanego wzorca okre�laj�cego szyfr.\n"
 
-#: src/cryptsetup.c:586
+#: src/cryptsetup.c:437
 #, c-format
 msgid "Cannot use %s as on-disk header.\n"
 msgstr "Nie mo�na u�y� %s jako nag��wka na dysku.\n"
 
-#: src/cryptsetup.c:601 src/cryptsetup.c:1034
+#: src/cryptsetup.c:452 src/cryptsetup.c:885
 msgid "Enter LUKS passphrase: "
 msgstr "Has�o LUKS: "
 
-#: src/cryptsetup.c:658
+#: src/cryptsetup.c:509
 msgid "Reduced data offset is allowed only for detached LUKS header.\n"
 msgstr "Offset zmniejszonych danych jest dozwolony tylko dla osobnego nag��wka LUKS.\n"
 
-#: src/cryptsetup.c:759 src/cryptsetup.c:814
+#: src/cryptsetup.c:610 src/cryptsetup.c:665
 #, c-format
 msgid "Key slot %d selected for deletion.\n"
 msgstr "klucz %d wybrany do usuni�cia.\n"
 
-#: src/cryptsetup.c:762
+#: src/cryptsetup.c:613
 #, c-format
 msgid "Key %d not active. Can't wipe.\n"
 msgstr "Klucz %d nie jest aktywny. Nie mo�na wyczy�ci�.\n"
 
-#: src/cryptsetup.c:770 src/cryptsetup.c:817
+#: src/cryptsetup.c:621 src/cryptsetup.c:668
 msgid "This is the last keyslot. Device will become unusable after purging this key."
 msgstr "To jest ostatni klucz. Urz�dzenie stanie si� bezu�yteczne po usuni�ciu tego klucza."
 
-#: src/cryptsetup.c:771
+#: src/cryptsetup.c:622
 msgid "Enter any remaining LUKS passphrase: "
 msgstr "Dowolne pozosta�e has�o LUKS: "
 
-#: src/cryptsetup.c:799
+#: src/cryptsetup.c:650
 msgid "Enter LUKS passphrase to be deleted: "
 msgstr "Has�o LUKS do usuni�cia: "
 
-#: src/cryptsetup.c:902
+#: src/cryptsetup.c:753
 msgid "Enter LUKS passphrase to be changed: "
 msgstr "Has�o LUKS, kt�re ma by� zmienione: "
 
-#: src/cryptsetup.c:939 src/cryptsetup_reencrypt.c:1018
+#: src/cryptsetup.c:790 src/cryptsetup_reencrypt.c:970
 msgid "Enter new LUKS passphrase: "
 msgstr "Nowe has�o LUKS: "
 
-#: src/cryptsetup.c:953
+#: src/cryptsetup.c:804
 #, c-format
 msgid "Key slot %d changed.\n"
 msgstr "Klucz numer %d zmieniony.\n"
 
-#: src/cryptsetup.c:959
+#: src/cryptsetup.c:810
 #, c-format
 msgid "Replaced with key slot %d.\n"
 msgstr "Zast�piono kluczem numer %d.\n"
 
-#: src/cryptsetup.c:964
+#: src/cryptsetup.c:815
 msgid "Failed to swap new key slot.\n"
 msgstr "Nie uda�o si� podstawi� nowego klucza.\n"
 
-#: src/cryptsetup.c:1023
+#: src/cryptsetup.c:874
 msgid ""
 "LUKS header dump with volume key is sensitive information\n"
 "which allows access to encrypted partition without passphrase.\n"
@@ -924,11 +895,11 @@ msgstr ""
 "Zrzut ten powinien by� zawsze zapisywany w postaci zaszyfrowanej\n"
 "w bezpiecznym miejscu."
 
-#: src/cryptsetup.c:1128 src/cryptsetup.c:1149
+#: src/cryptsetup.c:979 src/cryptsetup.c:1000
 msgid "Option --header-backup-file is required.\n"
 msgstr "Wymagana jest opcja --header-backup-file.\n"
 
-#: src/cryptsetup.c:1187 src/veritysetup.c:402
+#: src/cryptsetup.c:1027 src/veritysetup.c:328
 msgid ""
 "\n"
 "<action> is one of:\n"
@@ -936,7 +907,7 @@ msgstr ""
 "\n"
 "<akcja> to jedno z:\n"
 
-#: src/cryptsetup.c:1193
+#: src/cryptsetup.c:1033
 #, c-format
 msgid ""
 "\n"
@@ -951,7 +922,7 @@ msgstr ""
 "<numer klucza> to numer klucza LUKS do zmiany\n"
 "<plik klucza> to opcjonalny plik nowego klucza dla akcji luksAddKey\n"
 
-#: src/cryptsetup.c:1200
+#: src/cryptsetup.c:1040
 #, c-format
 msgid ""
 "\n"
@@ -962,7 +933,7 @@ msgstr ""
 "Domy�lne wkompilowane parametry plik�w klucza:\n"
 "\tMaksymalny rozmiar pliku klucza: %dkB, maksymalna d�ugo�� has�a interaktywnego %d (znak�w)\n"
 
-#: src/cryptsetup.c:1205
+#: src/cryptsetup.c:1045
 #, c-format
 msgid ""
 "\n"
@@ -977,196 +948,197 @@ msgstr ""
 "\tplain: %s, bit�w klucza: %d, skr�t has�a: %s\n"
 "\tLUKS1: %s, bit�w klucza: %d, skr�t nag��wka LUKS: %s, RNG: %s\n"
 
-#: src/cryptsetup.c:1273 src/veritysetup.c:486 src/cryptsetup_reencrypt.c:1207
+#: src/cryptsetup.c:1085 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1135
 msgid "Show this help message"
 msgstr "Wy�wietlenie tego opisu"
 
-#: src/cryptsetup.c:1274 src/veritysetup.c:487 src/cryptsetup_reencrypt.c:1208
+#: src/cryptsetup.c:1086 src/veritysetup.c:369 src/cryptsetup_reencrypt.c:1136
 msgid "Display brief usage"
 msgstr "Wy�wietlenie kr�tkiej informacji o sk�adni"
 
-#: src/cryptsetup.c:1278 src/veritysetup.c:491 src/cryptsetup_reencrypt.c:1212
+#: src/cryptsetup.c:1090 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1140
 msgid "Help options:"
 msgstr "Opcje pomocnicze:"
 
-#: src/cryptsetup.c:1279 src/veritysetup.c:492 src/cryptsetup_reencrypt.c:1213
+#: src/cryptsetup.c:1091 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1141
 msgid "Print package version"
 msgstr "Wypisanie wersji pakietu"
 
-#: src/cryptsetup.c:1280 src/veritysetup.c:493 src/cryptsetup_reencrypt.c:1214
+#: src/cryptsetup.c:1092 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1142
 msgid "Shows more detailed error messages"
 msgstr "Wy�wietlanie bardziej szczeg�owych komunikat�w b��d�w"
 
-#: src/cryptsetup.c:1281 src/veritysetup.c:494 src/cryptsetup_reencrypt.c:1215
+#: src/cryptsetup.c:1093 src/veritysetup.c:376 src/cryptsetup_reencrypt.c:1143
 msgid "Show debug messages"
 msgstr "Wy�wietlanie informacji diagnostycznych"
 
-#: src/cryptsetup.c:1282 src/cryptsetup_reencrypt.c:1217
+#: src/cryptsetup.c:1094 src/cryptsetup_reencrypt.c:1145
 msgid "The cipher used to encrypt the disk (see /proc/crypto)"
 msgstr "Szyfr u�ywany do zaszyfrowania dysku (p. /proc/crypto)"
 
-#: src/cryptsetup.c:1283 src/cryptsetup_reencrypt.c:1219
+#: src/cryptsetup.c:1095 src/cryptsetup_reencrypt.c:1147
 msgid "The hash used to create the encryption key from the passphrase"
 msgstr "Skr�t u�ywany do utworzenia klucza szyfruj�cego z has�a"
 
-#: src/cryptsetup.c:1284
+#: src/cryptsetup.c:1096
 msgid "Verifies the passphrase by asking for it twice"
 msgstr "Sprawdzenie poprawno�ci has�a poprzez dwukrotne pytanie"
 
-#: src/cryptsetup.c:1285 src/cryptsetup_reencrypt.c:1220
+#: src/cryptsetup.c:1097 src/cryptsetup_reencrypt.c:1148
 msgid "Read the key from a file."
 msgstr "Odczyt klucza z pliku."
 
-#: src/cryptsetup.c:1286
+#: src/cryptsetup.c:1098
 msgid "Read the volume (master) key from file."
 msgstr "Odczyt klucza wolumenu (klucza g��wnego) z pliku."
 
-#: src/cryptsetup.c:1287
+#: src/cryptsetup.c:1099
 msgid "Dump volume (master) key instead of keyslots info."
 msgstr "Zrzut (g��wnego) klucza wolumenu zamiast informacji o kluczach."
 
-#: src/cryptsetup.c:1288 src/cryptsetup_reencrypt.c:1218
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "The size of the encryption key"
 msgstr "Rozmiar klucza szyfruj�cego"
 
-#: src/cryptsetup.c:1288 src/cryptsetup_reencrypt.c:1218
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "BITS"
 msgstr "BIT�W"
 
-#: src/cryptsetup.c:1289 src/cryptsetup_reencrypt.c:1231
+#: src/cryptsetup.c:1101 src/cryptsetup_reencrypt.c:1159
 msgid "Limits the read from keyfile"
 msgstr "Ograniczenie odczytu z pliku klucza"
 
-#: src/cryptsetup.c:1289 src/cryptsetup.c:1290 src/cryptsetup.c:1291
-#: src/cryptsetup.c:1292 src/veritysetup.c:497 src/veritysetup.c:498
-#: src/veritysetup.c:500 src/cryptsetup_reencrypt.c:1230
-#: src/cryptsetup_reencrypt.c:1231
+#: src/cryptsetup.c:1101 src/cryptsetup.c:1102 src/cryptsetup.c:1103
+#: src/cryptsetup.c:1104 src/veritysetup.c:379 src/veritysetup.c:380
+#: src/veritysetup.c:382 src/cryptsetup_reencrypt.c:1158
+#: src/cryptsetup_reencrypt.c:1159 src/cryptsetup_reencrypt.c:1160
+#: src/cryptsetup_reencrypt.c:1161
 msgid "bytes"
 msgstr "bajty"
 
-#: src/cryptsetup.c:1290 src/cryptsetup_reencrypt.c:1230
+#: src/cryptsetup.c:1102 src/cryptsetup_reencrypt.c:1158
 msgid "Number of bytes to skip in keyfile"
 msgstr "Liczba bajt�w do pomini�cia w pliku klucza"
 
-#: src/cryptsetup.c:1291
+#: src/cryptsetup.c:1103
 msgid "Limits the read from newly added keyfile"
 msgstr "Ograniczenie odczytu z nowo dodanego pliku klucza"
 
-#: src/cryptsetup.c:1292
+#: src/cryptsetup.c:1104
 msgid "Number of bytes to skip in newly added keyfile"
 msgstr "Liczba bajt�w do pomini�cia w nowo dodanym kluczu"
 
-#: src/cryptsetup.c:1293
+#: src/cryptsetup.c:1105
 msgid "Slot number for new key (default is first free)"
 msgstr "Numer dla nowego klucza (domy�lny: pierwszy wolny)"
 
-#: src/cryptsetup.c:1294
+#: src/cryptsetup.c:1106
 msgid "The size of the device"
 msgstr "Rozmiar urz�dzenia"
 
-#: src/cryptsetup.c:1294 src/cryptsetup.c:1295 src/cryptsetup.c:1296
-#: src/cryptsetup.c:1302 src/cryptsetup_reencrypt.c:1232
+#: src/cryptsetup.c:1106 src/cryptsetup.c:1107 src/cryptsetup.c:1108
+#: src/cryptsetup.c:1114
 msgid "SECTORS"
 msgstr "SEKTOR�W"
 
-#: src/cryptsetup.c:1295
+#: src/cryptsetup.c:1107
 msgid "The start offset in the backend device"
 msgstr "Offset pocz�tku na urz�dzeniu przechowuj�cym"
 
-#: src/cryptsetup.c:1296
+#: src/cryptsetup.c:1108
 msgid "How many sectors of the encrypted data to skip at the beginning"
 msgstr "Liczba sektor�w zaszyfrowanych danych do pomini�cia"
 
-#: src/cryptsetup.c:1297
+#: src/cryptsetup.c:1109
 msgid "Create a readonly mapping"
 msgstr "Utworzenie odwzorowania tylko do odczytu"
 
-#: src/cryptsetup.c:1298 src/cryptsetup_reencrypt.c:1221
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "PBKDF2 iteration time for LUKS (in ms)"
 msgstr "Czas iteracji PBKDF2 dla LUKS (w milisekundach)"
 
-#: src/cryptsetup.c:1298 src/cryptsetup_reencrypt.c:1221
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "msecs"
 msgstr "ms"
 
-#: src/cryptsetup.c:1299 src/cryptsetup_reencrypt.c:1222
+#: src/cryptsetup.c:1111 src/cryptsetup_reencrypt.c:1150
 msgid "Do not ask for confirmation"
 msgstr "Bez pyta� o potwierdzenie"
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1112
 msgid "Timeout for interactive passphrase prompt (in seconds)"
 msgstr "Limit czasu przy interaktywnym pytaniu o has�o (w sekundach)"
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1112
 msgid "secs"
 msgstr "s"
 
-#: src/cryptsetup.c:1301 src/cryptsetup_reencrypt.c:1223
+#: src/cryptsetup.c:1113 src/cryptsetup_reencrypt.c:1151
 msgid "How often the input of the passphrase can be retried"
 msgstr "Jak cz�sto mo�na powtarza� pr�by wprowadzenia has�a"
 
-#: src/cryptsetup.c:1302
+#: src/cryptsetup.c:1114
 msgid "Align payload at <n> sector boundaries - for luksFormat"
 msgstr "Wyr�wnanie danych do granicy <n> sektor�w - dla luksFormat"
 
-#: src/cryptsetup.c:1303
+#: src/cryptsetup.c:1115
 msgid "File with LUKS header and keyslots backup."
 msgstr "Plik z kopi� zapasow� nag��wka LUKS i kluczy."
 
-#: src/cryptsetup.c:1304 src/cryptsetup_reencrypt.c:1224
+#: src/cryptsetup.c:1116 src/cryptsetup_reencrypt.c:1152
 msgid "Use /dev/random for generating volume key."
 msgstr "U�ycie /dev/random do wygenerowania klucza wolumenu."
 
-#: src/cryptsetup.c:1305 src/cryptsetup_reencrypt.c:1225
+#: src/cryptsetup.c:1117 src/cryptsetup_reencrypt.c:1153
 msgid "Use /dev/urandom for generating volume key."
 msgstr "U�ycie /dev/urandom do wygenerowania klucza wolumenu."
 
-#: src/cryptsetup.c:1306
+#: src/cryptsetup.c:1118
 msgid "Share device with another non-overlapping crypt segment."
 msgstr "Wsp�dzielenie urz�dzenia z innym, nie zachodz�cym segmentem szyfrowanym."
 
-#: src/cryptsetup.c:1307 src/veritysetup.c:503
+#: src/cryptsetup.c:1119 src/veritysetup.c:385
 msgid "UUID for device to use."
 msgstr "UUID dla urz�dzenia, kt�re ma by� u�yte."
 
-#: src/cryptsetup.c:1308
+#: src/cryptsetup.c:1120
 msgid "Allow discards (aka TRIM) requests for device."
 msgstr "Zezwolenie na ��dania porzucenia (TRIM) dla urz�dzenia."
 
-#: src/cryptsetup.c:1309
+#: src/cryptsetup.c:1121
 msgid "Device or file with separated LUKS header."
 msgstr "Urz�dzenie lub plik z osobnym nag��wkiem LUKS."
 
-#: src/cryptsetup.c:1310
+#: src/cryptsetup.c:1122
 msgid "Do not activate device, just check passphrase."
 msgstr "Sprawdzenie has�a bez uaktywniania urz�dzenia."
 
-#: src/cryptsetup.c:1329 src/veritysetup.c:520
+#: src/cryptsetup.c:1140 src/veritysetup.c:402
 msgid "[OPTION...] <action> <action-specific>"
 msgstr "[OPCJA...] <akcja> <parametry-akcji>"
 
-#: src/cryptsetup.c:1369 src/veritysetup.c:557
+#: src/cryptsetup.c:1180 src/veritysetup.c:439
 msgid "Argument <action> missing."
 msgstr "Brak argumentu <akcja>."
 
-#: src/cryptsetup.c:1375 src/veritysetup.c:563
+#: src/cryptsetup.c:1186 src/veritysetup.c:445
 msgid "Unknown action."
 msgstr "Nieznana akcja."
 
-#: src/cryptsetup.c:1390 src/veritysetup.c:578
+#: src/cryptsetup.c:1201 src/veritysetup.c:460
 #, c-format
 msgid "%s: requires %s as arguments"
 msgstr "%s: wymaga %s jako argument�w"
 
-#: src/cryptsetup.c:1399
+#: src/cryptsetup.c:1210
 msgid "Option --shared is allowed only for create operation.\n"
 msgstr "Opcja --shared jest dozwolona tylko dla operacji create.\n"
 
-#: src/cryptsetup.c:1407
+#: src/cryptsetup.c:1218
 msgid "Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"
 msgstr "Opcja --allow-discards jest obs�ugiwana tylko dla polece� luksOpen, loopaesOpen i create.\n"
 
-#: src/cryptsetup.c:1415
+#: src/cryptsetup.c:1226
 msgid ""
 "Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n"
 "To limit read from keyfile use --keyfile-size=(bytes)."
@@ -1175,100 +1147,105 @@ msgstr ""
 "i loopaesOpen.\n"
 "Aby ograniczy� odczyt z pliku klucza, nale�y u�y� --keyfile-size=(bajty)."
 
-#: src/cryptsetup.c:1422
+#: src/cryptsetup.c:1233
 msgid "Option --test-passphrase is allowed only for luksOpen.\n"
 msgstr "Opcja --test-passphrase jest dozwolona tylko dla operacji luksOpen.\n"
 
-#: src/cryptsetup.c:1427 src/cryptsetup_reencrypt.c:1298
+#: src/cryptsetup.c:1238 src/cryptsetup_reencrypt.c:1221
 msgid "Key size must be a multiple of 8 bits"
 msgstr "Rozmiar klucza musi by� wielokrotno�ci� 8 bit�w"
 
-#: src/cryptsetup.c:1434 src/cryptsetup_reencrypt.c:1303
+#: src/cryptsetup.c:1245 src/cryptsetup_reencrypt.c:1226
 msgid "Key slot is invalid."
 msgstr "Numer klucza jest nieprawid�owy."
 
-#: src/cryptsetup.c:1441
+#: src/cryptsetup.c:1252
 msgid "Option --key-file takes precedence over specified key file argument.\n"
 msgstr "Opcja --key-file ma priorytet nad podanym argumentem pliku klucza.\n"
 
-#: src/cryptsetup.c:1449 src/veritysetup.c:585 src/cryptsetup_reencrypt.c:1282
+#: src/cryptsetup.c:1260 src/veritysetup.c:467 src/cryptsetup_reencrypt.c:1210
 msgid "Negative number for option not permitted."
 msgstr "Liczba ujemna nie jest dozwolona dla tej opcji."
 
-#: src/cryptsetup.c:1453 src/cryptsetup_reencrypt.c:1275
-#: src/cryptsetup_reencrypt.c:1307
+#: src/cryptsetup.c:1264 src/cryptsetup_reencrypt.c:1204
+#: src/cryptsetup_reencrypt.c:1230
 msgid "Only one of --use-[u]random options is allowed."
 msgstr "Dozwolona jest tylko jedna z opcji --use-[u]random."
 
-#: src/cryptsetup.c:1457
+#: src/cryptsetup.c:1268
 msgid "Option --use-[u]random is allowed only for luksFormat."
 msgstr "Opcja --use-[u]random jest dozwolona tylko dla operacji luksFormat."
 
-#: src/cryptsetup.c:1461
+#: src/cryptsetup.c:1272
 msgid "Option --uuid is allowed only for luksFormat and luksUUID."
 msgstr "Opcja --uuid jest dozwolona tylko dla operacji luksFormat i luksUUID."
 
-#: src/cryptsetup.c:1465
+#: src/cryptsetup.c:1276
 msgid "Option --align-payload is allowed only for luksFormat."
 msgstr "Opcja --align-payload jest dozwolona tylko dla operacji luksFormat."
 
-#: src/cryptsetup.c:1470
+#: src/cryptsetup.c:1281
 msgid "Option --skip is supported only for create and loopaesOpen commands.\n"
 msgstr "Opcja --skip jest obs�ugiwana tylko dla polece� create i loopaesOpen.\n"
 
-#: src/cryptsetup.c:1475
+#: src/cryptsetup.c:1286
 msgid "Option --offset is supported only for create and loopaesOpen commands.\n"
 msgstr "Opcja --offset jest obs�ugiwana tylko dla polece� create i loopaesOpen.\n"
 
-#: src/veritysetup.c:118
+#: src/veritysetup.c:56
 msgid "Invalid salt string specified.\n"
 msgstr "Podano b��dny �a�cuch zarodka.\n"
 
-#: src/veritysetup.c:198
+#: src/veritysetup.c:89
+#, c-format
+msgid "Cannot create hash image %s for writing.\n"
+msgstr "Nie mo�na utworzy� obrazu hasza %s do zapisu.\n"
+
+#: src/veritysetup.c:148
 msgid "Invalid root hash string specified.\n"
 msgstr "Podano b��dny �a�cuch g��wnego hasza.\n"
 
-#: src/veritysetup.c:382
+#: src/veritysetup.c:308
 msgid "<data_device> <hash_device>"
 msgstr "<urz�dzenie_danych> <urz�dzenie_haszy>"
 
-#: src/veritysetup.c:382
+#: src/veritysetup.c:308
 msgid "format device"
 msgstr "sformatowanie urz�dzenia"
 
-#: src/veritysetup.c:383
+#: src/veritysetup.c:309
 msgid "<data_device> <hash_device> <root_hash>"
 msgstr "<urz�dzenie_danych> <urz�dzenie_haszy> <g��wny_hasz>"
 
-#: src/veritysetup.c:383
+#: src/veritysetup.c:309
 msgid "verify device"
 msgstr "weryfikacja urz�dzenia"
 
-#: src/veritysetup.c:384
+#: src/veritysetup.c:310
 msgid "<name> <data_device> <hash_device> <root_hash>"
 msgstr "<nazwa> <urz�dzenie_danych> <urz�dzenie_haszy> <g��wny_hasz>"
 
-#: src/veritysetup.c:384
+#: src/veritysetup.c:310
 msgid "create active device"
 msgstr "utworzenie aktywnego urz�dzenia"
 
-#: src/veritysetup.c:385
+#: src/veritysetup.c:311
 msgid "remove (deactivate) device"
 msgstr "usuni�cie (deaktywacja) urz�dzenia"
 
-#: src/veritysetup.c:386
+#: src/veritysetup.c:312
 msgid "show active device status"
 msgstr "pokazanie stanu aktywnego urz�dzenia"
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:313
 msgid "<hash_device>"
 msgstr "<urz�dzenie_haszy>"
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:313
 msgid "show on-disk information"
 msgstr "wy�wietlenie informacji z dysku"
 
-#: src/veritysetup.c:406
+#: src/veritysetup.c:332
 #, c-format
 msgid ""
 "\n"
@@ -1283,7 +1260,7 @@ msgstr ""
 "<urz�dzenie_haszy> to urz�dzenie zawieraj�ce dane weryfikacyjne\n"
 "<g��wny_hasz> to hasz g��wnego w�z�a na <urz�dzeniu_haszy>\n"
 
-#: src/veritysetup.c:413
+#: src/veritysetup.c:339
 #, c-format
 msgid ""
 "\n"
@@ -1294,237 +1271,263 @@ msgstr ""
 "Domy�lnie wkompilowane parametry dm-verity:\n"
 "\tHasz: %s, blok danych (bajt�w): %u, blok haszy (bajt�w): %u, rozmiar zarodka: %u, format haszy: %u\n"
 
-#: src/veritysetup.c:495
+#: src/veritysetup.c:377
 msgid "Do not use verity superblock"
 msgstr "Nieu�ywanie superbloku VERITY"
 
-#: src/veritysetup.c:496
+#: src/veritysetup.c:378
 msgid "Format type (1 - normal, 0 - original Chrome OS)"
 msgstr "Typ formatu (1 - normalny, 0 - oryginalny Chrome OS)"
 
-#: src/veritysetup.c:496
+#: src/veritysetup.c:378
 msgid "number"
 msgstr "liczba"
 
-#: src/veritysetup.c:497
+#: src/veritysetup.c:379
 msgid "Block size on the data device"
 msgstr "Rozmiar bloku na urz�dzeniu z danymi"
 
-#: src/veritysetup.c:498
+#: src/veritysetup.c:380
 msgid "Block size on the hash device"
 msgstr "Rozmiar bloku na urz�dzeniu z haszami"
 
-#: src/veritysetup.c:499
+#: src/veritysetup.c:381
 msgid "The number of blocks in the data file"
 msgstr "Liczba blok�w w pliku danych"
 
-#: src/veritysetup.c:499
+#: src/veritysetup.c:381
 msgid "blocks"
 msgstr "bloki"
 
-#: src/veritysetup.c:500
+#: src/veritysetup.c:382
 msgid "Starting offset on the hash device"
 msgstr "Offset pocz�tku na urz�dzeniu z haszami"
 
-#: src/veritysetup.c:501
+#: src/veritysetup.c:383
 msgid "Hash algorithm"
 msgstr "Algorytm skr�tu"
 
-#: src/veritysetup.c:501
+#: src/veritysetup.c:383
 msgid "string"
 msgstr "�a�cuch"
 
-#: src/veritysetup.c:502
+#: src/veritysetup.c:384
 msgid "Salt"
 msgstr "Zarodek"
 
-#: src/veritysetup.c:502
+#: src/veritysetup.c:384
 msgid "hex string"
 msgstr "�a�cuch szesnastkowy"
 
-#: src/cryptsetup_reencrypt.c:220
+#: src/cryptsetup_reencrypt.c:164
 #, c-format
 msgid "Cannot exclusively open %s, device in use.\n"
 msgstr "Nie mo�na otworzy� %s w trybie wy��cznym, urz�dzenie jest w u�yciu.\n"
 
-#: src/cryptsetup_reencrypt.c:224
+#: src/cryptsetup_reencrypt.c:168
 #, c-format
 msgid "Cannot open device %s\n"
 msgstr "Nie mo�na otworzy� urz�dzenia %s\n"
 
-#: src/cryptsetup_reencrypt.c:234 src/cryptsetup_reencrypt.c:460
-#: src/cryptsetup_reencrypt.c:870
+#: src/cryptsetup_reencrypt.c:178 src/cryptsetup_reencrypt.c:406
+#: src/cryptsetup_reencrypt.c:822
 msgid "Allocation of aligned memory failed.\n"
 msgstr "Przydzielenie wyr�wnanego obszaru pami�ci nie powiod�o si�.\n"
 
-#: src/cryptsetup_reencrypt.c:252
+#: src/cryptsetup_reencrypt.c:185
+#, c-format
+msgid "Cannot read device %s.\n"
+msgstr "Nie mo�na odczyta� urz�dzenia %s.\n"
+
+#: src/cryptsetup_reencrypt.c:196
 #, c-format
 msgid "Marking LUKS device %s unusable.\n"
 msgstr "Oznaczanie urz�dzenia LUKS %s jako bezu�ytecznego.\n"
 
-#: src/cryptsetup_reencrypt.c:257
+#: src/cryptsetup_reencrypt.c:201
 #, c-format
 msgid "Marking LUKS device %s usable.\n"
 msgstr "Oznaczenie urz�dzenia LUKS %s jako u�ytecznego.\n"
 
-#: src/cryptsetup_reencrypt.c:273
+#: src/cryptsetup_reencrypt.c:217
 #, c-format
 msgid "Cannot write device %s.\n"
 msgstr "Nie mo�na zapisa� na urz�dzenie %s.\n"
 
-#: src/cryptsetup_reencrypt.c:352
+#: src/cryptsetup_reencrypt.c:298
 msgid "Cannot write reencryption log file.\n"
 msgstr "Nie mo�na zapisa� pliku logu ponownego szyfrowania.\n"
 
-#: src/cryptsetup_reencrypt.c:401
+#: src/cryptsetup_reencrypt.c:347
 msgid "Cannot read reencryption log file.\n"
 msgstr "Nie mo�na odczyta� pliku logu ponownego szyfrowania.\n"
 
-#: src/cryptsetup_reencrypt.c:451
+#: src/cryptsetup_reencrypt.c:397
 #, c-format
-msgid "Log file %s exists, restarting reencryption.\n"
-msgstr "Plik logu %s istnieje, restart ponownego szyfrowania.\n"
+msgid "Log file %s exists, resuming reencryption.\n"
+msgstr "Plik logu %s istnieje, wznowienie ponownego szyfrowania.\n"
 
-#: src/cryptsetup_reencrypt.c:505
+#: src/cryptsetup_reencrypt.c:451
 msgid "Activation of temporary devices failed.\n"
 msgstr "Aktywacja urz�dze� tymczasowych nie powiod�a si�.\n"
 
-#: src/cryptsetup_reencrypt.c:530
+#: src/cryptsetup_reencrypt.c:476
 #, c-format
 msgid "New LUKS header for device %s created.\n"
 msgstr "Utworzono nowy nag��wek LUKS dla urz�dzenia %s.\n"
 
-#: src/cryptsetup_reencrypt.c:538
+#: src/cryptsetup_reencrypt.c:484
 #, c-format
 msgid "Activated keyslot %i.\n"
 msgstr "Uaktywniono klucz %i.\n"
 
-#: src/cryptsetup_reencrypt.c:562
+#: src/cryptsetup_reencrypt.c:508
 #, c-format
 msgid "LUKS header backup of device %s created.\n"
 msgstr "Utworzono kopi� zapasow� nag��wka LUKS urz�dzenia %s.\n"
 
-#: src/cryptsetup_reencrypt.c:590
+#: src/cryptsetup_reencrypt.c:536
 msgid "Creation of LUKS backup headers failed.\n"
 msgstr "Tworzenie kopii zapasowych nag��wk�w LUKS nie powiod�o si�.\n"
 
-#: src/cryptsetup_reencrypt.c:685
+#: src/cryptsetup_reencrypt.c:631
 #, c-format
 msgid "Cannot restore LUKS header on device %s.\n"
 msgstr "Nie mo�na odtworzy� nag��wka LUKS na urz�dzeniu %s.\n"
 
-#: src/cryptsetup_reencrypt.c:687
+#: src/cryptsetup_reencrypt.c:633
 #, c-format
 msgid "LUKS header on device %s restored.\n"
 msgstr "Odtworzono nag��wek LUKS na urz�dzeniu %s.\n"
 
-#: src/cryptsetup_reencrypt.c:719
+#: src/cryptsetup_reencrypt.c:665
 #, c-format
 msgid "Progress: %5.1f%%, ETA %02llu:%02llu, %4llu MiB written, speed %5.1f MiB/s%s"
 msgstr "Post�p: %5.1f%%, ETA %02llu:%02llu, zapisano %4llu MiB, szybko�� %5.1f MiB/s%s"
 
-#: src/cryptsetup_reencrypt.c:735 src/cryptsetup_reencrypt.c:807
+#: src/cryptsetup_reencrypt.c:681 src/cryptsetup_reencrypt.c:757
 msgid "Cannot seek to device offset.\n"
 msgstr "Nie mo�na przemie�ci� si� we w�a�ciwe po�o�enie urz�dzenia.\n"
 
-#: src/cryptsetup_reencrypt.c:853 src/cryptsetup_reencrypt.c:859
+#: src/cryptsetup_reencrypt.c:803 src/cryptsetup_reencrypt.c:809
 msgid "Cannot open temporary LUKS header file.\n"
 msgstr "Nie mo�na otworzy� pliku tymczasowego nag��wka LUKS.\n"
 
-#: src/cryptsetup_reencrypt.c:865
+#: src/cryptsetup_reencrypt.c:815
 msgid "Cannot get device size.\n"
 msgstr "Nie mo�na pobra� rozmiaru urz�dzenia.\n"
 
-#: src/cryptsetup_reencrypt.c:887
+#: src/cryptsetup_reencrypt.c:839
 msgid "Interrupted by a signal.\n"
 msgstr "Przerwano sygna�em.\n"
 
-#: src/cryptsetup_reencrypt.c:889
+#: src/cryptsetup_reencrypt.c:841
 msgid "IO error during reencryption.\n"
 msgstr "B��d we/wy podczas ponownego szyfrowania.\n"
 
-#: src/cryptsetup_reencrypt.c:990
+#: src/cryptsetup_reencrypt.c:942
 msgid "Key file can be used only with --key-slot or with exactly one key slot active.\n"
 msgstr "Rozmiaru klucza mo�na u�y� tylko z --key-slot albo przy dok�adnie jednym aktywnym kluczu.\n"
 
-#: src/cryptsetup_reencrypt.c:1032
+#: src/cryptsetup_reencrypt.c:984
 msgid "Enter any LUKS passphrase: "
 msgstr "Dowolne has�o LUKS: "
 
-#: src/cryptsetup_reencrypt.c:1039
+#: src/cryptsetup_reencrypt.c:991
 #, c-format
 msgid "Enter LUKS passphrase for key slot %u: "
 msgstr "Has�o LUKS dla klucza %u: "
 
-#: src/cryptsetup_reencrypt.c:1088
+#: src/cryptsetup_reencrypt.c:1040
 msgid "Cannot open reencryption log file.\n"
 msgstr "Nie mo�na otworzy� pliku logu ponownego szyfrowania.\n"
 
-#: src/cryptsetup_reencrypt.c:1216
+#: src/cryptsetup_reencrypt.c:1144
 msgid "Reencryption block size"
 msgstr "Rozmiar bloku ponownego szyfrowania"
 
-#: src/cryptsetup_reencrypt.c:1216
+#: src/cryptsetup_reencrypt.c:1144
 msgid "MiB"
 msgstr "MiB"
 
-#: src/cryptsetup_reencrypt.c:1226
+#: src/cryptsetup_reencrypt.c:1154
 msgid "Use direct-io when accesing devices."
 msgstr "U�ycie bezpo�redniego we/wy przy dost�pie do urz�dze�."
 
-#: src/cryptsetup_reencrypt.c:1227
+#: src/cryptsetup_reencrypt.c:1155
 msgid "Use fsync after each block."
 msgstr "U�ycie fsync po ka�dym bloku."
 
-#: src/cryptsetup_reencrypt.c:1228
+#: src/cryptsetup_reencrypt.c:1156
 msgid "Update log file after every block."
 msgstr "Uaktualnianie pliku logu po ka�dym bloku."
 
-#: src/cryptsetup_reencrypt.c:1229
+#: src/cryptsetup_reencrypt.c:1157
 msgid "Use only this slot (others will be disabled)."
 msgstr "U�ycie tylko tego slotu (wy��czenie pozosta�ych)."
 
-#: src/cryptsetup_reencrypt.c:1232
+#: src/cryptsetup_reencrypt.c:1160
 msgid "Reduce data device size (move data offset). DANGEROUS!"
 msgstr "Ograniczenie rozmiaru urz�dzenia danych (przesuni�cie po�o�enia danych). NIEBEZPIECZNE!"
 
-#: src/cryptsetup_reencrypt.c:1233
+#: src/cryptsetup_reencrypt.c:1161
+msgid "Use only specified device size (ignore rest of device). DANGEROUS!"
+msgstr "U�ycie tylko okre�lonego rozmiaru urz�dzenia (zignorowanie pozosta�ej cz�ci). NIEBEZPIECZNE!"
+
+#: src/cryptsetup_reencrypt.c:1162
 msgid "Create new header on not encrypted device."
 msgstr "Utworzenie nowego nag��wka na nieszyfrowanym urz�dzeniu."
 
-#: src/cryptsetup_reencrypt.c:1249
+#: src/cryptsetup_reencrypt.c:1178
 msgid "[OPTION...] <device>"
 msgstr "[OPCJA...] <urz�dzenie>"
 
-#: src/cryptsetup_reencrypt.c:1263
+#: src/cryptsetup_reencrypt.c:1192
 msgid "WARNING: this is experimental code, it can completely break your data.\n"
 msgstr "UWAGA: ten kod jest eksperymentalny, mo�e ca�kowicie uszkodzi� dane.\n"
 
-#: src/cryptsetup_reencrypt.c:1264
+#: src/cryptsetup_reencrypt.c:1193
 #, c-format
 msgid "Reencryption will change: volume key%s%s%s%s.\n"
 msgstr "Ponowne szyfrowanie zmieni: klucz wolumenu%s%s%s%s.\n"
 
-#: src/cryptsetup_reencrypt.c:1265
+#: src/cryptsetup_reencrypt.c:1194
 msgid ", set hash to "
 msgstr ", hasz na "
 
-#: src/cryptsetup_reencrypt.c:1266
+#: src/cryptsetup_reencrypt.c:1195
 msgid ", set cipher to "
 msgstr ", szyfr na"
 
-#: src/cryptsetup_reencrypt.c:1271
+#: src/cryptsetup_reencrypt.c:1200
 msgid "Argument required."
 msgstr "Wymagany argument."
 
-#: src/cryptsetup_reencrypt.c:1288
-msgid "Only values between 1MiB and 64 MiB allowed for reencryption block size."
-msgstr "Jako rozmiar bloku ponownego szyfrowania dozwolone s� jedynie warto�ci od 1MiB do 64MiB."
+#: src/cryptsetup_reencrypt.c:1216
+msgid "Only values between 1 MiB and 64 MiB allowed for reencryption block size."
+msgstr "Jako rozmiar bloku ponownego szyfrowania dozwolone s� jedynie warto�ci od 1 MiB do 64 MiB."
+
+#: src/cryptsetup_reencrypt.c:1235 src/cryptsetup_reencrypt.c:1240
+msgid "Invalid device size specification."
+msgstr "B��dne okre�lenie rozmiaru urz�dzenia."
 
-#: src/cryptsetup_reencrypt.c:1293
+#: src/cryptsetup_reencrypt.c:1243
 msgid "Maximum device reduce size is 64 MiB."
 msgstr "Maksymalna warto�� ograniczenia rozmiaru urz�dzenia to 64MiB."
 
-#: src/cryptsetup_reencrypt.c:1311
-msgid "Option --new must be used together with --reduce_device_size."
+#: src/cryptsetup_reencrypt.c:1246
+msgid "Reduce size must be multiple of 512 bytes sector."
+msgstr "Rozmiar ograniczenia musi by� wielokrotno�ci� 512-bajtowego sektora."
+
+#: src/cryptsetup_reencrypt.c:1250
+msgid "Option --new must be used together with --reduce-device-size."
 msgstr "Opcja --new musi by� u�yta wraz z --reduce_device_size."
+
+#: src/utils_tools.c:114
+msgid "Command successful.\n"
+msgstr "Polecenie si� powiod�o.\n"
+
+#: src/utils_tools.c:128
+#, c-format
+msgid "Command failed with code %i"
+msgstr "Polecenie nie powiod�o si� z kodem %i"
diff --git a/po/uk.po b/po/uk.po
index 0ebff5c..f07d2f1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,10 +5,10 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: cryptsetup 1.5.0-rc2\n"
+"Project-Id-Version: cryptsetup 1.5.1\n"
 "Report-Msgid-Bugs-To: dm-crypt@saout.de\n"
-"POT-Creation-Date: 2012-06-20 11:31+0200\n"
-"PO-Revision-Date: 2012-06-22 22:14+0300\n"
+"POT-Creation-Date: 2012-09-19 15:48+0200\n"
+"PO-Revision-Date: 2012-10-13 13:48+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -18,11 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: lib/libdevmapper.c:199
+#: lib/libdevmapper.c:230
+msgid "Cannot initialize device-mapper, running as non-root user.\n"
+msgstr "Не можна ініціалізувати device-mapper, якщо програму запущено не від імені адміністратора (root).\n"
+
+#: lib/libdevmapper.c:233
 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n"
 msgstr "Не вдалося ініціалізувати device-mapper. Чи завантажено модуль ядра dm_mod?\n"
 
-#: lib/libdevmapper.c:492
+#: lib/libdevmapper.c:516
 #, c-format
 msgid "DM-UUID for device %s was truncated.\n"
 msgstr "DM-UUID для пристрою %s було обрізано.\n"
@@ -53,323 +57,264 @@ msgstr "Надійшов запит щодо невідомого RNG якост
 msgid "Error %d reading from RNG: %s\n"
 msgstr "Помилка %d під час читання з RNG: %s\n"
 
-#: lib/setup.c:172
+#: lib/setup.c:179
 msgid "Cannot initialize crypto RNG backend.\n"
 msgstr "Не вдалося ініціалізувати допоміжну програму шифрування RNG.\n"
 
-#: lib/setup.c:178
+#: lib/setup.c:185
 msgid "Cannot initialize crypto backend.\n"
 msgstr "Не вдалося ініціалізувати допоміжну програму шифрування.\n"
 
-#: lib/setup.c:201 lib/setup.c:1096 lib/verity/verity.c:119
+#: lib/setup.c:208 lib/setup.c:1060 lib/verity/verity.c:120
 #, c-format
 msgid "Hash algorithm %s not supported.\n"
 msgstr "Підтримки алгоритму хешування %s не передбачено.\n"
 
-#: lib/setup.c:204 lib/loopaes/loopaes.c:88
+#: lib/setup.c:211 lib/loopaes/loopaes.c:88
 #, c-format
 msgid "Key processing error (using hash %s).\n"
 msgstr "Помилка під час обробки ключа (на основі хешу %s).\n"
 
-#: lib/setup.c:245
+#: lib/setup.c:252
 msgid "All key slots full.\n"
 msgstr "Заповнено всі слоти ключів.\n"
 
-#: lib/setup.c:252
+#: lib/setup.c:259
 #, c-format
 msgid "Key slot %d is invalid, please select between 0 and %d.\n"
 msgstr "Слот ключа %d є некоректним, будь ласка, виберіть число від 0 до %d.\n"
 
-#: lib/setup.c:258
+#: lib/setup.c:265
 #, c-format
 msgid "Key slot %d is full, please select another one.\n"
 msgstr "Слот ключа %d заповнено, будь ласка, виберіть інший.\n"
 
-#: lib/setup.c:372
+#: lib/setup.c:379
 #, c-format
 msgid "Enter passphrase for %s: "
 msgstr "Введіть пароль до %s: "
 
-#: lib/setup.c:521
-msgid "Cannot find a free loopback device.\n"
-msgstr "Не вдалося знайти вільний петльовий пристрій.\n"
-
-#: lib/setup.c:528
-msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
-msgstr "Спроба долучення петльового пристрою зазнала невдачі (потрібен петльовий пристрій з встановленим прапорцем автоматичного спорожнення).\n"
-
-#: lib/setup.c:601
+#: lib/setup.c:560
 #, c-format
 msgid "Header detected but device %s is too small.\n"
 msgstr "Виявлено заголовок, але об’єм пристрою %s є надто малим.\n"
 
-#: lib/setup.c:617 lib/setup.c:1312
+#: lib/setup.c:576 lib/setup.c:1278
 msgid "This operation is not supported for this device type.\n"
 msgstr "Підтримки цієї дії для цього типу пристроїв не передбачено.\n"
 
-#: lib/setup.c:829 lib/setup.c:1276 lib/setup.c:2076
+#: lib/setup.c:782 lib/setup.c:1242 lib/setup.c:2034
 #, c-format
 msgid "Device %s is not active.\n"
 msgstr "Пристрій %s є неактивним.\n"
 
-#: lib/setup.c:846
+#: lib/setup.c:799
 #, c-format
 msgid "Underlying device for crypt device %s disappeared.\n"
 msgstr "Зник основний пристрій для пристрою для шифрування %s.\n"
 
-#: lib/setup.c:909
+#: lib/setup.c:862
 msgid "Invalid plain crypt parameters.\n"
 msgstr "Некоректні параметри звичайного шифрування.\n"
 
-#: lib/setup.c:914 lib/setup.c:1025
+#: lib/setup.c:867 lib/setup.c:989
 msgid "Invalid key size.\n"
 msgstr "Некоректний розмір ключа.\n"
 
-#: lib/setup.c:958
+#: lib/setup.c:911
 msgid "Can't format LUKS without device.\n"
 msgstr "Форматування LUKS без пристрою неможливе.\n"
 
-#: lib/setup.c:999
+#: lib/setup.c:959
 #, c-format
 msgid "Cannot format device %s which is still in use.\n"
 msgstr "Не можна форматувати пристрій %s, який перебуває у користуванні.\n"
 
-#: lib/setup.c:1002
+#: lib/setup.c:962
+#, c-format
+msgid "Cannot format device %s, permission denied.\n"
+msgstr "Не можна форматувати пристрій %s, недостатні права доступу.\n"
+
+#: lib/setup.c:966
 #, c-format
 msgid "Cannot wipe header on device %s.\n"
 msgstr "Не можна витирати заголовок на пристрої %s.\n"
 
-#: lib/setup.c:1020
+#: lib/setup.c:984
 msgid "Can't format LOOPAES without device.\n"
 msgstr "Не можна форматувати LOOPAES без пристрою.\n"
 
-#: lib/setup.c:1056
+#: lib/setup.c:1020
 msgid "Can't format VERITY without device.\n"
 msgstr "Форматування VERITY без пристрою неможливе.\n"
 
-#: lib/setup.c:1064 lib/verity/verity.c:102
+#: lib/setup.c:1028 lib/verity/verity.c:103
 #, c-format
 msgid "Unsupported VERITY hash type %d.\n"
 msgstr "Непідтримуваний тип хешування VERITY, %d.\n"
 
-#: lib/setup.c:1070 lib/verity/verity.c:110
+#: lib/setup.c:1034 lib/verity/verity.c:111
 msgid "Unsupported VERITY block size.\n"
 msgstr "Непідтримуваний розмір блоку VERITY.\n"
 
-#: lib/setup.c:1075 lib/verity/verity.c:73
+#: lib/setup.c:1039 lib/verity/verity.c:74
 msgid "Unsupported VERITY hash offset.\n"
 msgstr "Непідтримуваний відступ хешу VERITY.\n"
 
-#: lib/setup.c:1185
+#: lib/setup.c:1151
 #, c-format
 msgid "Unknown crypt device type %s requested.\n"
 msgstr "Надіслано запит щодо невідомого типу пристрою шифрування, %s.\n"
 
-#: lib/setup.c:1327
+#: lib/setup.c:1293
 msgid "Do you really want to change UUID of device?"
 msgstr "Ви справді хочете змінити UUID пристрою?"
 
-#: lib/setup.c:1418 lib/setup.c:1465 lib/setup.c:1514 lib/setup.c:1580
-#: lib/setup.c:1656 lib/setup.c:1737 lib/setup.c:1783 lib/setup.c:2141
-#: lib/setup.c:2419
+#: lib/setup.c:1379 lib/setup.c:1424 lib/setup.c:1473 lib/setup.c:1539
+#: lib/setup.c:1615 lib/setup.c:1696 lib/setup.c:1742 lib/setup.c:2099
+#: lib/setup.c:2382
 msgid "This operation is supported only for LUKS device.\n"
 msgstr "Підтримку цієї дії передбачено лише для пристроїв LUKS.\n"
 
-#: lib/setup.c:1425
+#: lib/setup.c:1386
 #, c-format
 msgid "Volume %s is not active.\n"
 msgstr "Том %s не є активним.\n"
 
-#: lib/setup.c:1437
+#: lib/setup.c:1397
 #, c-format
 msgid "Volume %s is already suspended.\n"
 msgstr "Том %s вже приспано.\n"
 
-#: lib/setup.c:1475 lib/setup.c:1524
+#: lib/setup.c:1434 lib/setup.c:1483
 #, c-format
 msgid "Volume %s is not suspended.\n"
 msgstr "Том %s не приспано.\n"
 
-#: lib/setup.c:1531 lib/setup.c:1908 lib/setup.c:1922 src/cryptsetup.c:343
+#: lib/setup.c:1490 lib/setup.c:1867 lib/setup.c:1881 src/cryptsetup.c:194
 msgid "Enter passphrase: "
 msgstr "Введіть пароль: "
 
-#: lib/setup.c:1594 lib/setup.c:1670
+#: lib/setup.c:1553 lib/setup.c:1629
 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n"
 msgstr "Не вдалося додати слот ключа, всі слоти вимкнено і не вказано ключа тому.\n"
 
-#: lib/setup.c:1603 lib/setup.c:1676 lib/setup.c:1680
+#: lib/setup.c:1562 lib/setup.c:1635 lib/setup.c:1639
 msgid "Enter any passphrase: "
 msgstr "Введіть будь-який пароль: "
 
-#: lib/setup.c:1620 lib/setup.c:1693 lib/setup.c:1697 lib/setup.c:1760
+#: lib/setup.c:1579 lib/setup.c:1652 lib/setup.c:1656 lib/setup.c:1719
 msgid "Enter new passphrase for key slot: "
 msgstr "Введіть новий пароль для слота ключа: "
 
-#: lib/setup.c:1751 lib/setup.c:2012 lib/setup.c:2025 lib/setup.c:2152
+#: lib/setup.c:1710 lib/setup.c:1971 lib/setup.c:1984 lib/setup.c:2110
 msgid "Volume key does not match the volume.\n"
 msgstr "Ключ тому не відповідає тому.\n"
 
-#: lib/setup.c:1789
+#: lib/setup.c:1748
 #, c-format
 msgid "Key slot %d is invalid.\n"
 msgstr "Слот ключа %d є некоректним.\n"
 
-#: lib/setup.c:1794
+#: lib/setup.c:1753
 #, c-format
 msgid "Key slot %d is not used.\n"
 msgstr "Слот ключа %d не використовується.\n"
 
-#: lib/setup.c:1824 lib/setup.c:1896 lib/setup.c:1988
+#: lib/setup.c:1783 lib/setup.c:1855 lib/setup.c:1947
 #, c-format
 msgid "Device %s already exists.\n"
 msgstr "Пристрій %s вже існує.\n"
 
-#: lib/setup.c:1999
+#: lib/setup.c:1958
 msgid "Incorrect volume key specified for plain device.\n"
 msgstr "Для пристрою зі звичайним шифруванням вказано помилковий ключ тому.\n"
 
-#: lib/setup.c:2032
+#: lib/setup.c:1991
 msgid "Incorrect root hash specified for verity device.\n"
 msgstr "Для пристрою перевірки вказано помилковий кореневий хеш.\n"
 
-#: lib/setup.c:2051
+#: lib/setup.c:2009
 msgid "Device type is not properly initialised.\n"
 msgstr "Тип пристрою не ініціалізовано належним чином.\n"
 
-#: lib/setup.c:2080
+#: lib/setup.c:2038
 #, c-format
 msgid "Invalid device %s.\n"
 msgstr "Некоректний пристрій %s.\n"
 
-#: lib/setup.c:2108
+#: lib/setup.c:2066
 msgid "Volume key buffer too small.\n"
 msgstr "Буфер ключів тому є занадто малим.\n"
 
-#: lib/setup.c:2116
+#: lib/setup.c:2074
 msgid "Cannot retrieve volume key for plain device.\n"
 msgstr "Неможливо отримати ключ тому для пристрою зі звичайним шифруванням.\n"
 
-#: lib/setup.c:2122
+#: lib/setup.c:2080
 #, c-format
 msgid "This operation is not supported for %s crypt device.\n"
 msgstr "Підтримки цієї дії для шифрованого пристрою %s не передбачено.\n"
 
-#: lib/setup.c:2317
+#: lib/setup.c:2275
 msgid "Dump operation is not supported for this device type.\n"
 msgstr "Підтримки дії зі створення дампу для цього типу пристроїв не передбачено.\n"
 
-#: lib/utils.c:275
-#, c-format
-msgid "Device %s doesn't exist or access denied.\n"
-msgstr "Пристрою %s не існує або доступ до цього пристрою заборонено.\n"
-
-#: lib/utils.c:285
-#, c-format
-msgid "Cannot open device %s for %s%s access.\n"
-msgstr "Не вдалося відкрити пристрій %s для доступу %s%s.\n"
-
-#: lib/utils.c:286
-msgid "exclusive "
-msgstr "ексклюзивний "
-
-#: lib/utils.c:287
-msgid "writable"
-msgstr "придатний до запису"
-
-#: lib/utils.c:287
-msgid "read-only"
-msgstr "тільки читання"
-
-#: lib/utils.c:294 src/cryptsetup_reencrypt.c:241
-#, c-format
-msgid "Cannot read device %s.\n"
-msgstr "Не вдалося виконати читання з пристрою %s.\n"
-
-#: lib/utils.c:391
-#, c-format
-msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
-msgstr "Не можна використовувати пристрій %s, оскільки його вже використано (призначено або змонтовано).\n"
-
-#: lib/utils.c:395
-#, c-format
-msgid "Cannot get info about device %s.\n"
-msgstr "Не вдалося отримати дані щодо пристрою %s.\n"
-
-#: lib/utils.c:401
-#, c-format
-msgid "Requested offset is beyond real size of device %s.\n"
-msgstr "Бажана точка відступу перебуває за межами об’єму пристрою %s.\n"
-
-#: lib/utils.c:409
-#, c-format
-msgid "Device %s has zero size.\n"
-msgstr "Об’єм пристрою %s є нульовим.\n"
-
-#: lib/utils.c:420 lib/luks1/keymanage.c:85
-#, c-format
-msgid "Device %s is too small.\n"
-msgstr "Об’єм пристрою %s є надто малим.\n"
-
-#: lib/utils.c:444
-msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
-msgstr "УВАГА!!! Небезпека доступу до даних у пам’яті. Працюєте від імені адміністратора?\n"
-
-#: lib/utils.c:450
+#: lib/utils.c:238
 msgid "Cannot get process priority.\n"
 msgstr "Не вдалося отримати значення пріоритетності процесу.\n"
 
-#: lib/utils.c:453 lib/utils.c:466
+#: lib/utils.c:241 lib/utils.c:254
 #, c-format
 msgid "setpriority %d failed: %s\n"
 msgstr "помилка під час встановлення пріоритетності %d: %s\n"
 
-#: lib/utils.c:464
+#: lib/utils.c:252
 msgid "Cannot unlock memory.\n"
 msgstr "Не вдалося розблокувати пам’ять.\n"
 
-#: lib/utils_crypt.c:221 lib/utils_crypt.c:234 lib/utils_crypt.c:338
-#: lib/utils_crypt.c:354
+#: lib/utils_crypt.c:225 lib/utils_crypt.c:238 lib/utils_crypt.c:385
+#: lib/utils_crypt.c:400
 msgid "Out of memory while reading passphrase.\n"
 msgstr "Під час читання пароля вичерпано пам’ять.\n"
 
-#: lib/utils_crypt.c:226 lib/utils_crypt.c:241
+#: lib/utils_crypt.c:230 lib/utils_crypt.c:245
 msgid "Error reading passphrase from terminal.\n"
 msgstr "Помилка під час читання пароля з термінала.\n"
 
-#: lib/utils_crypt.c:239
+#: lib/utils_crypt.c:243
 msgid "Verify passphrase: "
 msgstr "Перевірка пароля: "
 
-#: lib/utils_crypt.c:246
+#: lib/utils_crypt.c:250
 msgid "Passphrases do not match.\n"
 msgstr "Паролі не збігаються.\n"
 
-#: lib/utils_crypt.c:287
+#: lib/utils_crypt.c:334
 msgid "Cannot use offset with terminal input.\n"
 msgstr "Не можна використовувати відступ у даних, що надходять з термінала.\n"
 
-#: lib/utils_crypt.c:306
+#: lib/utils_crypt.c:353
 msgid "Failed to open key file.\n"
 msgstr "Не вдалося відкрити файл ключа.\n"
 
-#: lib/utils_crypt.c:315
+#: lib/utils_crypt.c:362
 msgid "Failed to stat key file.\n"
 msgstr "Не вдалося отримати статистичні дані щодо файла ключа.\n"
 
-#: lib/utils_crypt.c:323 lib/utils_crypt.c:345
+#: lib/utils_crypt.c:370 lib/utils_crypt.c:391
 msgid "Cannot seek to requested keyfile offset.\n"
 msgstr "Не вдалося встановити потрібну позицію у файлі ключа.\n"
 
-#: lib/utils_crypt.c:362
+#: lib/utils_crypt.c:408
 msgid "Error reading passphrase.\n"
 msgstr "Помилка під час читання пароля.\n"
 
-#: lib/utils_crypt.c:380
+#: lib/utils_crypt.c:426
 msgid "Maximum keyfile size exceeded.\n"
 msgstr "Перевищено максимальний розмір файла ключа.\n"
 
-#: lib/utils_crypt.c:385
+#: lib/utils_crypt.c:431
 msgid "Cannot read requested amount of data.\n"
 msgstr "Не вдалося прочитати бажаний об’єм даних.\n"
 
@@ -381,20 +326,71 @@ msgstr "Контрольні суми FIPS не збігаються.\n"
 msgid "Running in FIPS mode.\n"
 msgstr "Працюємо у режимі FIPS.\n"
 
-#: lib/luks1/keyencryption.c:82
+#: lib/utils_device.c:48
+#, c-format
+msgid "Device %s doesn't exist or access denied.\n"
+msgstr "Пристрою %s не існує або доступ до цього пристрою заборонено.\n"
+
+#: lib/utils_device.c:58 lib/luks1/keymanage.c:298 lib/luks1/keymanage.c:527
+#: lib/luks1/keymanage.c:567 lib/verity/verity.c:80 lib/verity/verity.c:174
+#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:304
+#: lib/verity/verity_hash.c:324
+#, c-format
+msgid "Cannot open device %s.\n"
+msgstr "Не вдалося відкрити пристрій %s.\n"
+
+#: lib/utils_device.c:333
+msgid "Cannot use a loopback device, running as non-root user.\n"
+msgstr "Не можна використовувати петльовий пристрій, програму запущено не від імені адміністративного користувача (root).\n"
+
+#: lib/utils_device.c:336
+msgid "Cannot find a free loopback device.\n"
+msgstr "Не вдалося знайти вільний петльовий пристрій.\n"
+
+#: lib/utils_device.c:343
+msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
+msgstr "Спроба долучення петльового пристрою зазнала невдачі (потрібен петльовий пристрій з встановленим прапорцем автоматичного спорожнення).\n"
+
+#: lib/utils_device.c:383
+#, c-format
+msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
+msgstr "Не можна використовувати пристрій %s, оскільки його вже використано (призначено або змонтовано).\n"
+
+#: lib/utils_device.c:387
+#, c-format
+msgid "Cannot get info about device %s.\n"
+msgstr "Не вдалося отримати дані щодо пристрою %s.\n"
+
+#: lib/utils_device.c:393
+#, c-format
+msgid "Requested offset is beyond real size of device %s.\n"
+msgstr "Бажана точка відступу перебуває за межами об’єму пристрою %s.\n"
+
+#: lib/utils_device.c:401
+#, c-format
+msgid "Device %s has zero size.\n"
+msgstr "Об’єм пристрою %s є нульовим.\n"
+
+#: lib/utils_device.c:412 lib/luks1/keymanage.c:89
 #, c-format
-msgid "Unable to obtain sector size for %s"
-msgstr "Не вдалося отримати розмір сектора %s"
+msgid "Device %s is too small.\n"
+msgstr "Об’єм пристрою %s є надто малим.\n"
 
-#: lib/luks1/keyencryption.c:109
+#: lib/luks1/keyencryption.c:66 lib/luks1/keymanage.c:295
+#: lib/luks1/keymanage.c:564 lib/luks1/keymanage.c:981
+#, c-format
+msgid "Cannot write to device %s, permission denied.\n"
+msgstr "Не вдалося виконати запис на пристрій %s, недостатні права доступу.\n"
+
+#: lib/luks1/keyencryption.c:91
 msgid "Key size in XTS mode must be 256 or 512 bits.\n"
 msgstr "Розмір ключа у режимі XTS має бути рівним 256 або 512 бітів.\n"
 
-#: lib/luks1/keyencryption.c:132
+#: lib/luks1/keyencryption.c:117
 msgid "Failed to obtain device mapper directory."
 msgstr "Не вдалося отримати каталог призначених пристроїв."
 
-#: lib/luks1/keyencryption.c:148
+#: lib/luks1/keyencryption.c:133
 #, c-format
 msgid ""
 "Failed to setup dm-crypt key mapping for device %s.\n"
@@ -405,67 +401,67 @@ msgstr ""
 "Перевірте, чи передбачено у ядрі підтримку шифрування %s (докладніші дані можна знайти у журналі системи (syslog)).\n"
 "%s"
 
-#: lib/luks1/keyencryption.c:158
+#: lib/luks1/keyencryption.c:143
 msgid "Failed to open temporary keystore device.\n"
 msgstr "Не вдалося відкрити пристрій тимчасового сховища ключів.\n"
 
-#: lib/luks1/keyencryption.c:165
+#: lib/luks1/keyencryption.c:150
 msgid "Failed to access temporary keystore device.\n"
 msgstr "Не вдалося отримати доступ до пристрою тимчасового сховища ключів.\n"
 
-#: lib/luks1/keymanage.c:157
+#: lib/luks1/keymanage.c:161
 #, c-format
 msgid "Requested file %s already exist.\n"
 msgstr "Файл %s, щодо якого надійшов запит, вже існує.\n"
 
-#: lib/luks1/keymanage.c:177 lib/luks1/keymanage.c:408
-#: src/cryptsetup_reencrypt.c:1062
+#: lib/luks1/keymanage.c:181 lib/luks1/keymanage.c:417
+#: src/cryptsetup_reencrypt.c:1014
 #, c-format
 msgid "Device %s is not a valid LUKS device.\n"
 msgstr "Пристрій %s не є коректним пристроєм LUKS.\n"
 
-#: lib/luks1/keymanage.c:197
+#: lib/luks1/keymanage.c:202
 #, c-format
 msgid "Cannot write header backup file %s.\n"
 msgstr "Не вдалося записати файл резервної копії заголовка, %s.\n"
 
-#: lib/luks1/keymanage.c:224
+#: lib/luks1/keymanage.c:229
 #, c-format
 msgid "Backup file %s doesn't exist.\n"
 msgstr "Файла резервної копії, %s, не існує.\n"
 
-#: lib/luks1/keymanage.c:233
+#: lib/luks1/keymanage.c:238
 msgid "Backup file doesn't contain valid LUKS header.\n"
 msgstr "Файл резервної копії не містить коректного заголовка LUKS.\n"
 
-#: lib/luks1/keymanage.c:246
+#: lib/luks1/keymanage.c:251
 #, c-format
 msgid "Cannot open header backup file %s.\n"
 msgstr "Не вдалося відкрити файл резервної копії заголовка, %s.\n"
 
-#: lib/luks1/keymanage.c:252
+#: lib/luks1/keymanage.c:257
 #, c-format
 msgid "Cannot read header backup file %s.\n"
 msgstr "Не вдалося прочитати дані з файла резервної копії заголовка, %s.\n"
 
-#: lib/luks1/keymanage.c:263
+#: lib/luks1/keymanage.c:268
 msgid "Data offset or key size differs on device and backup, restore failed.\n"
 msgstr "Відступ у даних або розмір ключа на пристрої і у резервній копії є різними. Відновлення неможливе.\n"
 
-#: lib/luks1/keymanage.c:271
+#: lib/luks1/keymanage.c:276
 #, c-format
 msgid "Device %s %s%s"
 msgstr "Пристрій %s %s%s"
 
-#: lib/luks1/keymanage.c:272
+#: lib/luks1/keymanage.c:277
 msgid "does not contain LUKS header. Replacing header can destroy data on that device."
 msgstr "не містить заголовка LUKS. Заміна заголовка може зруйнувати дані, що зберігаються на пристрої."
 
-#: lib/luks1/keymanage.c:273
+#: lib/luks1/keymanage.c:278
 msgid "already contains LUKS header. Replacing header will destroy existing keyslots."
 msgstr "вже містить заголовок LUKS. Заміна заголовка призведе до руйнування вже створених слотів ключів."
 
-#: lib/luks1/keymanage.c:274
+#: lib/luks1/keymanage.c:279
 msgid ""
 "\n"
 "WARNING: real device header has different UUID than backup!"
@@ -473,140 +469,124 @@ msgstr ""
 "\n"
 "ПОПЕРЕДЖЕННЯ: заголовок, що зберігається на пристрої, має інший UUID, ніж заголовок у резервній копії!"
 
-#: lib/luks1/keymanage.c:289 lib/luks1/keymanage.c:513
-#: lib/luks1/keymanage.c:549 lib/verity/verity.c:79 lib/verity/verity.c:172
-#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:302
-#: lib/verity/verity_hash.c:321
-#, c-format
-msgid "Cannot open device %s.\n"
-msgstr "Не вдалося відкрити пристрій %s.\n"
-
-#: lib/luks1/keymanage.c:319
+#: lib/luks1/keymanage.c:328
 msgid "Non standard key size, manual repair required.\n"
 msgstr "Нестандартний розмір ключа, слід виправити дані вручну.\n"
 
-#: lib/luks1/keymanage.c:324
+#: lib/luks1/keymanage.c:333
 msgid "Non standard keyslots alignment, manual repair required.\n"
 msgstr "Нестандартне вирівнювання слотів ключів, слід виправити дані вручну.\n"
 
-#: lib/luks1/keymanage.c:330
+#: lib/luks1/keymanage.c:339
 msgid "Repairing keyslots.\n"
 msgstr "Виправлення слотів ключів.\n"
 
-#: lib/luks1/keymanage.c:341
+#: lib/luks1/keymanage.c:350
 msgid "Repair failed."
 msgstr "Спроба виправлення зазнала невдачі."
 
-#: lib/luks1/keymanage.c:353
+#: lib/luks1/keymanage.c:362
 #, c-format
 msgid "Keyslot %i: offset repaired (%u -> %u).\n"
 msgstr "Слот ключа %i: виправлено відступ (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:361
+#: lib/luks1/keymanage.c:370
 #, c-format
 msgid "Keyslot %i: stripes repaired (%u -> %u).\n"
 msgstr "Слот ключа %i: виправлено смужки (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:370
+#: lib/luks1/keymanage.c:379
 #, c-format
 msgid "Keyslot %i: bogus partition signature.\n"
 msgstr "Слот ключа %i: зайвий підпис розділу.\n"
 
-#: lib/luks1/keymanage.c:375
+#: lib/luks1/keymanage.c:384
 #, c-format
 msgid "Keyslot %i: salt wiped.\n"
 msgstr "Слот ключа %i: дані ініціалізації (сіль) витерто.\n"
 
-#: lib/luks1/keymanage.c:386
+#: lib/luks1/keymanage.c:395
 msgid "Writing LUKS header to disk.\n"
 msgstr "Запис заголовка LUKS на диск.\n"
 
-#: lib/luks1/keymanage.c:411
+#: lib/luks1/keymanage.c:420
 #, c-format
 msgid "Unsupported LUKS version %d.\n"
 msgstr "Непідтримувана версія LUKS, %d.\n"
 
-#: lib/luks1/keymanage.c:417 lib/luks1/keymanage.c:621
+#: lib/luks1/keymanage.c:426 lib/luks1/keymanage.c:639
 #, c-format
 msgid "Requested LUKS hash %s is not supported.\n"
 msgstr "Підтримки бажаного хешування LUKS, %s, не передбачено.\n"
 
-#: lib/luks1/keymanage.c:432
+#: lib/luks1/keymanage.c:441
 #, c-format
 msgid "LUKS keyslot %u is invalid.\n"
 msgstr "Слот ключа LUKS %u є некоректним.\n"
 
-#: lib/luks1/keymanage.c:446 src/cryptsetup.c:537
+#: lib/luks1/keymanage.c:455 src/cryptsetup.c:388
 msgid "No known problems detected for LUKS header.\n"
 msgstr "У заголовку LUKS не виявлено жодних проблем.\n"
 
-#: lib/luks1/keymanage.c:480
+#: lib/luks1/keymanage.c:488
 #, c-format
 msgid "Cannot open file %s.\n"
 msgstr "Не вдалося відкрити файл %s.\n"
 
-#: lib/luks1/keymanage.c:570
+#: lib/luks1/keymanage.c:588
 #, c-format
 msgid "Error during update of LUKS header on device %s.\n"
 msgstr "Помилка під час оновлення заголовка LUKS на пристрої %s.\n"
 
-#: lib/luks1/keymanage.c:577
+#: lib/luks1/keymanage.c:595
 #, c-format
 msgid "Error re-reading LUKS header after update on device %s.\n"
 msgstr "Помилка під час спроби повторного читання заголовка LUKS після оновлення на пристрої %s.\n"
 
-#: lib/luks1/keymanage.c:589
+#: lib/luks1/keymanage.c:608
 #, c-format
 msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n"
 msgstr "Несумісні параметри PBKDF2 (з використанням алгоритму хешування %s).\n"
 
-#: lib/luks1/keymanage.c:626 lib/luks1/keymanage.c:708
+#: lib/luks1/keymanage.c:644 lib/luks1/keymanage.c:726
 msgid "Wrong LUKS UUID format provided.\n"
 msgstr "Вказано UUID LUKS у помилковому форматі.\n"
 
-#: lib/luks1/keymanage.c:651
+#: lib/luks1/keymanage.c:669
 msgid "Cannot create LUKS header: reading random salt failed.\n"
 msgstr "Не вдалося створити заголовок LUKS: помилка читання випадкових даних для ініціалізації.\n"
 
-#: lib/luks1/keymanage.c:668
+#: lib/luks1/keymanage.c:686
 #, c-format
 msgid "Cannot create LUKS header: header digest failed (using hash %s).\n"
 msgstr "Не вдалося створити заголовок LUKS: помилка під час обчислення контрольної суми заголовка (з використанням хешу %s).\n"
 
-#: lib/luks1/keymanage.c:733
+#: lib/luks1/keymanage.c:751
 #, c-format
 msgid "Key slot %d active, purge first.\n"
 msgstr "Слот ключа %d є активним. Його слід спочатку спорожнити.\n"
 
-#: lib/luks1/keymanage.c:738
+#: lib/luks1/keymanage.c:757
 #, c-format
 msgid "Key slot %d material includes too few stripes. Header manipulation?\n"
 msgstr "Ентропія даних слота ключа %d є надто низькою. Маніпуляції з заголовком?\n"
 
-#: lib/luks1/keymanage.c:805
-msgid "Failed to write to key storage.\n"
-msgstr "Не вдалося виконати запис до сховища ключів.\n"
-
-#: lib/luks1/keymanage.c:890
-msgid "Failed to read from key storage.\n"
-msgstr "Не вдалося виконати читання даних зі сховища ключів.\n"
-
-#: lib/luks1/keymanage.c:900
+#: lib/luks1/keymanage.c:914
 #, c-format
 msgid "Key slot %d unlocked.\n"
 msgstr "Слот ключа %d розблоковано.\n"
 
-#: lib/luks1/keymanage.c:936 src/cryptsetup.c:736 src/cryptsetup.c:920
-#: src/cryptsetup_reencrypt.c:966 src/cryptsetup_reencrypt.c:1000
+#: lib/luks1/keymanage.c:949 src/cryptsetup.c:587 src/cryptsetup.c:771
+#: src/cryptsetup_reencrypt.c:918 src/cryptsetup_reencrypt.c:952
 msgid "No key available with this passphrase.\n"
 msgstr "Для цього пароля немає відповідного ключа.\n"
 
-#: lib/luks1/keymanage.c:954
+#: lib/luks1/keymanage.c:967
 #, c-format
 msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n"
 msgstr "Слот ключа %d є некоректним, будь ласка, виберіть слот ключа з номером від 0 до %d.\n"
 
-#: lib/luks1/keymanage.c:968
+#: lib/luks1/keymanage.c:985
 #, c-format
 msgid "Cannot wipe device %s.\n"
 msgstr "Не вдалося витерти пристрій %s.\n"
@@ -623,42 +603,42 @@ msgstr "Будь ласка, скористайтеся командою gpg --d
 msgid "Incompatible loop-AES keyfile detected.\n"
 msgstr "Виявлено несумісний з loop-AES файл ключа.\n"
 
-#: lib/loopaes/loopaes.c:231
+#: lib/loopaes/loopaes.c:230
 msgid "Kernel doesn't support loop-AES compatible mapping.\n"
 msgstr "У ядрі не передбачено підтримки призначення, сумісного з loop-AES.\n"
 
-#: lib/verity/verity.c:68 lib/verity/verity.c:166
+#: lib/verity/verity.c:69 lib/verity/verity.c:168
 msgid "Verity device doesn't use on-disk header.\n"
 msgstr "На пристрої перевірки не використовується вбудований заголовок.\n"
 
-#: lib/verity/verity.c:91
+#: lib/verity/verity.c:92
 #, c-format
 msgid "Device %s is not a valid VERITY device.\n"
 msgstr "Пристрій %s не є коректним пристроєм VERITY.\n"
 
-#: lib/verity/verity.c:97
+#: lib/verity/verity.c:98
 #, c-format
 msgid "Unsupported VERITY version %d.\n"
 msgstr "Непідтримувана версія VERITY, %d.\n"
 
-#: lib/verity/verity.c:127
+#: lib/verity/verity.c:128
 msgid "VERITY header corrupted.\n"
 msgstr "Пошкоджено заголовок VERITY.\n"
 
-#: lib/verity/verity.c:161
+#: lib/verity/verity.c:163
 msgid "Wrong VERITY UUID format provided.\n"
 msgstr "Вказано UUID VERITY у помилковому форматі.\n"
 
-#: lib/verity/verity.c:189
+#: lib/verity/verity.c:191
 #, c-format
 msgid "Error during update of verity header on device %s.\n"
 msgstr "Помилка під час оновлення заголовка verity на пристрої %s.\n"
 
-#: lib/verity/verity.c:265
+#: lib/verity/verity.c:270
 msgid "Kernel doesn't support dm-verity mapping.\n"
 msgstr "У ядрі не передбачено підтримки призначення за dm-verity.\n"
 
-#: lib/verity/verity.c:276
+#: lib/verity/verity.c:281
 msgid "Verity device detected corruption after activation.\n"
 msgstr "Виявлено пошкодження даних на пристрої перевірки після активації.\n"
 
@@ -667,7 +647,7 @@ msgstr "Виявлено пошкодження даних на пристрої
 msgid "Spare area is not zeroed at position %<PRIu64>.\n"
 msgstr "Резервну область не занулено у позиції %<PRIu64>.\n"
 
-#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:247
+#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:248
 #: lib/verity/verity_hash.c:278 lib/verity/verity_hash.c:285
 msgid "Device offset overflow.\n"
 msgstr "Переповнення відступу на пристрої.\n"
@@ -677,27 +657,27 @@ msgstr "Переповнення відступу на пристрої.\n"
 msgid "Verification failed at position %<PRIu64>.\n"
 msgstr "Помилка під час перевірки за позицією %<PRIu64>.\n"
 
-#: lib/verity/verity_hash.c:233
+#: lib/verity/verity_hash.c:234
 msgid "Invalid size parameters for verity device.\n"
 msgstr "Некоректні параметри розміру для пристрою перевірки.\n"
 
-#: lib/verity/verity_hash.c:265
+#: lib/verity/verity_hash.c:266
 msgid "Too many tree levels for verity volume.\n"
 msgstr "Занадто високий рівень вкладеності для тому перевірки.\n"
 
-#: lib/verity/verity_hash.c:351
+#: lib/verity/verity_hash.c:355
 msgid "Verification of data area failed.\n"
 msgstr "Не вдалося перевірити область даних.\n"
 
-#: lib/verity/verity_hash.c:356
+#: lib/verity/verity_hash.c:360
 msgid "Verification of root hash failed.\n"
 msgstr "Не вдалося перевірити кореневий хеш.\n"
 
-#: lib/verity/verity_hash.c:362
+#: lib/verity/verity_hash.c:366
 msgid "Input/output error while creating hash area.\n"
 msgstr "Під час створення області хешу сталася помилка введення або виведення даних.\n"
 
-#: lib/verity/verity_hash.c:364
+#: lib/verity/verity_hash.c:368
 msgid "Creation of hash area failed.\n"
 msgstr "Не вдалося створити область хешу.\n"
 
@@ -706,215 +686,206 @@ msgstr "Не вдалося створити область хешу.\n"
 msgid "WARNING: Kernel cannot activate device if data block size exceeds page size (%u).\n"
 msgstr "Попередження: ядро не зможе задіяти пристрій, якщо розмір блоку перевищуватиме розмір сторінки (%u).\n"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "<name> <device>"
 msgstr "<назва> <пристрій>"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "create device"
 msgstr "створити пристрій"
 
-#: src/cryptsetup.c:106 src/cryptsetup.c:107 src/cryptsetup.c:108
-#: src/cryptsetup.c:118 src/cryptsetup.c:125 src/veritysetup.c:385
-#: src/veritysetup.c:386
+#: src/cryptsetup.c:89 src/cryptsetup.c:90 src/cryptsetup.c:91
+#: src/cryptsetup.c:101 src/cryptsetup.c:108 src/veritysetup.c:311
+#: src/veritysetup.c:312
 msgid "<name>"
 msgstr "<назва>"
 
-#: src/cryptsetup.c:106
+#: src/cryptsetup.c:89
 msgid "remove device"
 msgstr "вилучити пристрій"
 
-#: src/cryptsetup.c:107
+#: src/cryptsetup.c:90
 msgid "resize active device"
 msgstr "змінити розмір активного пристрою"
 
-#: src/cryptsetup.c:108
+#: src/cryptsetup.c:91
 msgid "show device status"
 msgstr "показати стан пристрою"
 
-#: src/cryptsetup.c:109 src/cryptsetup.c:116 src/cryptsetup.c:117
-#: src/cryptsetup.c:119 src/cryptsetup.c:120 src/cryptsetup.c:121
-#: src/cryptsetup.c:122 src/cryptsetup.c:123
+#: src/cryptsetup.c:92 src/cryptsetup.c:99 src/cryptsetup.c:100
+#: src/cryptsetup.c:102 src/cryptsetup.c:103 src/cryptsetup.c:104
+#: src/cryptsetup.c:105 src/cryptsetup.c:106
 msgid "<device>"
 msgstr "<пристрій>"
 
-#: src/cryptsetup.c:109
+#: src/cryptsetup.c:92
 msgid "try to repair on-disk metadata"
 msgstr "спробувати виправити метадані на диску"
 
-#: src/cryptsetup.c:110 src/cryptsetup.c:112
+#: src/cryptsetup.c:93 src/cryptsetup.c:95
 msgid "<device> [<new key file>]"
 msgstr "<пристрій> [<новий файл ключа>]"
 
-#: src/cryptsetup.c:110
+#: src/cryptsetup.c:93
 msgid "formats a LUKS device"
 msgstr "форматує пристрій LUKS"
 
-#: src/cryptsetup.c:111 src/cryptsetup.c:124
+#: src/cryptsetup.c:94 src/cryptsetup.c:107
 msgid "<device> <name> "
 msgstr "<пристрій> <назва> "
 
-#: src/cryptsetup.c:111
+#: src/cryptsetup.c:94
 msgid "open LUKS device as mapping <name>"
 msgstr "відкрити пристрій LUKS як призначення <назва>"
 
-#: src/cryptsetup.c:112
+#: src/cryptsetup.c:95
 msgid "add key to LUKS device"
 msgstr "додати ключ до пристрою LUKS"
 
-#: src/cryptsetup.c:113 src/cryptsetup.c:114
+#: src/cryptsetup.c:96 src/cryptsetup.c:97
 msgid "<device> [<key file>]"
 msgstr "<пристрій> [<файл ключа>]"
 
-#: src/cryptsetup.c:113
+#: src/cryptsetup.c:96
 msgid "removes supplied key or key file from LUKS device"
 msgstr "вилучає наданий ключ або файл ключа з пристрою LUKS"
 
-#: src/cryptsetup.c:114
+#: src/cryptsetup.c:97
 msgid "changes supplied key or key file of LUKS device"
 msgstr "змінює наданий ключ або файл ключа пристрою LUKS"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "<device> <key slot>"
 msgstr "<пристрій> <слот ключа>"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "wipes key with number <key slot> from LUKS device"
 msgstr "вилучає ключ з номером <слот ключа> з пристрою LUKS"
 
-#: src/cryptsetup.c:116
+#: src/cryptsetup.c:99
 msgid "print UUID of LUKS device"
 msgstr "вивести UUID пристрою LUKS"
 
-#: src/cryptsetup.c:117
+#: src/cryptsetup.c:100
 msgid "tests <device> for LUKS partition header"
 msgstr "виконати спробу виявлення заголовка розділу LUKS на пристрої <пристрій>"
 
-#: src/cryptsetup.c:118
+#: src/cryptsetup.c:101
 msgid "remove LUKS mapping"
 msgstr "вилучити призначення LUKS"
 
-#: src/cryptsetup.c:119
+#: src/cryptsetup.c:102
 msgid "dump LUKS partition information"
 msgstr "створити дамп даних щодо розділу LUKS"
 
-#: src/cryptsetup.c:120
+#: src/cryptsetup.c:103
 msgid "Suspend LUKS device and wipe key (all IOs are frozen)."
 msgstr "Приспати пристрій LUKS і витерти ключ (роботу всіх каналів введення-виведення буде заморожено)."
 
-#: src/cryptsetup.c:121
+#: src/cryptsetup.c:104
 msgid "Resume suspended LUKS device."
 msgstr "Відновити роботу приспаного пристрою LUKS."
 
-#: src/cryptsetup.c:122
+#: src/cryptsetup.c:105
 msgid "Backup LUKS device header and keyslots"
 msgstr "Створити резервну копію заголовка пристрою LUKS і слотів ключів"
 
-#: src/cryptsetup.c:123
+#: src/cryptsetup.c:106
 msgid "Restore LUKS device header and keyslots"
 msgstr "Відновити заголовок пристрою LUKS і слоти ключів"
 
-#: src/cryptsetup.c:124
+#: src/cryptsetup.c:107
 msgid "open loop-AES device as mapping <name>"
 msgstr "відкрити пристрій loop-AES як призначення <назва>"
 
-#: src/cryptsetup.c:125
+#: src/cryptsetup.c:108
 msgid "remove loop-AES mapping"
 msgstr "вилучити призначення loop-AES"
 
-#: src/cryptsetup.c:218
+#: src/cryptsetup.c:123
 msgid "Can't do passphrase verification on non-tty inputs.\n"
 msgstr "Перевірку паролів не можна виконувати на основі вхідних даних, які надходять не з tty.\n"
 
-#: src/cryptsetup.c:233 src/veritysetup.c:432
-msgid "Command successful.\n"
-msgstr "Команду виконано успішно.\n"
-
-#: src/cryptsetup.c:247 src/veritysetup.c:446
-#, c-format
-msgid "Command failed with code %i"
-msgstr "Спроба виконання команди завершилася повідомленням про помилку з кодом %i"
-
-#: src/cryptsetup.c:375
+#: src/cryptsetup.c:226
 msgid "Option --key-file is required.\n"
 msgstr "Слід вказати параметр --key-file.\n"
 
-#: src/cryptsetup.c:541
+#: src/cryptsetup.c:392
 msgid "Really try to repair LUKS device header?"
 msgstr "Спробувати відновити заголовок пристрою LUKS?"
 
-#: src/cryptsetup.c:566
+#: src/cryptsetup.c:417
 #, c-format
 msgid "This will overwrite data on %s irrevocably."
 msgstr "Дані на %s буде перезаписано без можливості відновлення."
 
-#: src/cryptsetup.c:568
+#: src/cryptsetup.c:419
 msgid "memory allocation error in action_luksFormat"
 msgstr "помилка під час отримання області пам’яті у action_luksFormat"
 
-#: src/cryptsetup.c:580 src/cryptsetup_reencrypt.c:576
-#: src/cryptsetup_reencrypt.c:611
+#: src/cryptsetup.c:431 src/cryptsetup_reencrypt.c:522
+#: src/cryptsetup_reencrypt.c:557
 msgid "No known cipher specification pattern detected.\n"
 msgstr "Не виявлено жодного відомого зразка специфікації шифрування.\n"
 
-#: src/cryptsetup.c:586
+#: src/cryptsetup.c:437
 #, c-format
 msgid "Cannot use %s as on-disk header.\n"
 msgstr "Не можна використовувати %s як заголовок на диску.\n"
 
-#: src/cryptsetup.c:601 src/cryptsetup.c:1034
+#: src/cryptsetup.c:452 src/cryptsetup.c:885
 msgid "Enter LUKS passphrase: "
 msgstr "Введіть пароль LUKS: "
 
-#: src/cryptsetup.c:658
+#: src/cryptsetup.c:509
 msgid "Reduced data offset is allowed only for detached LUKS header.\n"
 msgstr "Зменшений відступ даних можна використовувати лише для від’єднаних заголовків LUKS.\n"
 
-#: src/cryptsetup.c:759 src/cryptsetup.c:814
+#: src/cryptsetup.c:610 src/cryptsetup.c:665
 #, c-format
 msgid "Key slot %d selected for deletion.\n"
 msgstr "Слот ключа %d позначено для вилучення.\n"
 
-#: src/cryptsetup.c:762
+#: src/cryptsetup.c:613
 #, c-format
 msgid "Key %d not active. Can't wipe.\n"
 msgstr "Ключ %d не є активним. Його не можна витерти.\n"
 
-#: src/cryptsetup.c:770 src/cryptsetup.c:817
+#: src/cryptsetup.c:621 src/cryptsetup.c:668
 msgid "This is the last keyslot. Device will become unusable after purging this key."
 msgstr "Це останній слот ключа. Пристрій стане непридатним для використання після спорожнення цього ключа."
 
-#: src/cryptsetup.c:771
+#: src/cryptsetup.c:622
 msgid "Enter any remaining LUKS passphrase: "
 msgstr "Введіть будь-який інший пароль LUKS: "
 
-#: src/cryptsetup.c:799
+#: src/cryptsetup.c:650
 msgid "Enter LUKS passphrase to be deleted: "
 msgstr "Введіть пароль LUKS, який слід вилучити: "
 
-#: src/cryptsetup.c:902
+#: src/cryptsetup.c:753
 msgid "Enter LUKS passphrase to be changed: "
 msgstr "Введіть пароль LUKS, який слід змінити: "
 
-#: src/cryptsetup.c:939 src/cryptsetup_reencrypt.c:1018
+#: src/cryptsetup.c:790 src/cryptsetup_reencrypt.c:970
 msgid "Enter new LUKS passphrase: "
 msgstr "Введіть новий пароль LUKS: "
 
-#: src/cryptsetup.c:953
+#: src/cryptsetup.c:804
 #, c-format
 msgid "Key slot %d changed.\n"
 msgstr "Слот ключа %d змінено.\n"
 
-#: src/cryptsetup.c:959
+#: src/cryptsetup.c:810
 #, c-format
 msgid "Replaced with key slot %d.\n"
 msgstr "Замінено слотом ключа %d.\n"
 
-#: src/cryptsetup.c:964
+#: src/cryptsetup.c:815
 msgid "Failed to swap new key slot.\n"
 msgstr "Не вдалося зарезервувати новий слот ключа.\n"
 
-#: src/cryptsetup.c:1023
+#: src/cryptsetup.c:874
 msgid ""
 "LUKS header dump with volume key is sensitive information\n"
 "which allows access to encrypted partition without passphrase.\n"
@@ -925,11 +896,11 @@ msgstr ""
 "без пароля. Цей дамп слід зберігати у зашифрованому форматі\n"
 "у безпечному місці."
 
-#: src/cryptsetup.c:1128 src/cryptsetup.c:1149
+#: src/cryptsetup.c:979 src/cryptsetup.c:1000
 msgid "Option --header-backup-file is required.\n"
 msgstr "Слід вказати параметр --header-backup-file.\n"
 
-#: src/cryptsetup.c:1187 src/veritysetup.c:402
+#: src/cryptsetup.c:1027 src/veritysetup.c:328
 msgid ""
 "\n"
 "<action> is one of:\n"
@@ -937,7 +908,7 @@ msgstr ""
 "\n"
 "<дія> є однією з таких:\n"
 
-#: src/cryptsetup.c:1193
+#: src/cryptsetup.c:1033
 #, c-format
 msgid ""
 "\n"
@@ -952,7 +923,7 @@ msgstr ""
 "<слот ключа> — номер слота ключа LUKS, який слід змінити\n"
 "<файл ключа> — необов’язковий файл ключа для нового ключа для дії luksAddKey\n"
 
-#: src/cryptsetup.c:1200
+#: src/cryptsetup.c:1040
 #, c-format
 msgid ""
 "\n"
@@ -963,7 +934,7 @@ msgstr ""
 "Типові вбудовані параметри файла ключа:\n"
 "\tМаксимальний розмір файла ключа: %d кБ, максимальна довжина інтерактивного пароля: %d (символів)\n"
 
-#: src/cryptsetup.c:1205
+#: src/cryptsetup.c:1045
 #, c-format
 msgid ""
 "\n"
@@ -978,196 +949,197 @@ msgstr ""
 "\tзвичайне: %s, ключ: %d-бітовий, хешування пароля: %s\n"
 "\tLUKS1: %s, ключ: %d-бітовий, хешування заголовка LUKS: %s, RNG: %s\n"
 
-#: src/cryptsetup.c:1273 src/veritysetup.c:486 src/cryptsetup_reencrypt.c:1207
+#: src/cryptsetup.c:1085 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1135
 msgid "Show this help message"
 msgstr "Показати цю довідку"
 
-#: src/cryptsetup.c:1274 src/veritysetup.c:487 src/cryptsetup_reencrypt.c:1208
+#: src/cryptsetup.c:1086 src/veritysetup.c:369 src/cryptsetup_reencrypt.c:1136
 msgid "Display brief usage"
 msgstr "Показати короткі настанови щодо користування"
 
-#: src/cryptsetup.c:1278 src/veritysetup.c:491 src/cryptsetup_reencrypt.c:1212
+#: src/cryptsetup.c:1090 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1140
 msgid "Help options:"
 msgstr "Пункти довідки:"
 
-#: src/cryptsetup.c:1279 src/veritysetup.c:492 src/cryptsetup_reencrypt.c:1213
+#: src/cryptsetup.c:1091 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1141
 msgid "Print package version"
 msgstr "Вивести дані щодо версії пакунка"
 
-#: src/cryptsetup.c:1280 src/veritysetup.c:493 src/cryptsetup_reencrypt.c:1214
+#: src/cryptsetup.c:1092 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1142
 msgid "Shows more detailed error messages"
 msgstr "Показувати докладні повідомлення про помилки"
 
-#: src/cryptsetup.c:1281 src/veritysetup.c:494 src/cryptsetup_reencrypt.c:1215
+#: src/cryptsetup.c:1093 src/veritysetup.c:376 src/cryptsetup_reencrypt.c:1143
 msgid "Show debug messages"
 msgstr "Показувати повідомлення зневадження"
 
-#: src/cryptsetup.c:1282 src/cryptsetup_reencrypt.c:1217
+#: src/cryptsetup.c:1094 src/cryptsetup_reencrypt.c:1145
 msgid "The cipher used to encrypt the disk (see /proc/crypto)"
 msgstr "Шифр, який використано для шифрування даних диска (див. /proc/crypto)"
 
-#: src/cryptsetup.c:1283 src/cryptsetup_reencrypt.c:1219
+#: src/cryptsetup.c:1095 src/cryptsetup_reencrypt.c:1147
 msgid "The hash used to create the encryption key from the passphrase"
 msgstr "Хеш, використаний для створення ключа шифрування на основі пароля"
 
-#: src/cryptsetup.c:1284
+#: src/cryptsetup.c:1096
 msgid "Verifies the passphrase by asking for it twice"
 msgstr "Перевіряє пароль повторним запитом щодо нього"
 
-#: src/cryptsetup.c:1285 src/cryptsetup_reencrypt.c:1220
+#: src/cryptsetup.c:1097 src/cryptsetup_reencrypt.c:1148
 msgid "Read the key from a file."
 msgstr "Прочитати ключ з файла."
 
-#: src/cryptsetup.c:1286
+#: src/cryptsetup.c:1098
 msgid "Read the volume (master) key from file."
 msgstr "Прочитати ключ тому (основний ключ) з файла."
 
-#: src/cryptsetup.c:1287
+#: src/cryptsetup.c:1099
 msgid "Dump volume (master) key instead of keyslots info."
 msgstr "Створити дамп ключа тому (основного ключа) замість показу даних щодо слотів ключів."
 
-#: src/cryptsetup.c:1288 src/cryptsetup_reencrypt.c:1218
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "The size of the encryption key"
 msgstr "Розмір ключа шифрування"
 
-#: src/cryptsetup.c:1288 src/cryptsetup_reencrypt.c:1218
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "BITS"
 msgstr "БІТИ"
 
-#: src/cryptsetup.c:1289 src/cryptsetup_reencrypt.c:1231
+#: src/cryptsetup.c:1101 src/cryptsetup_reencrypt.c:1159
 msgid "Limits the read from keyfile"
 msgstr "Обмежує читання з файла ключа"
 
-#: src/cryptsetup.c:1289 src/cryptsetup.c:1290 src/cryptsetup.c:1291
-#: src/cryptsetup.c:1292 src/veritysetup.c:497 src/veritysetup.c:498
-#: src/veritysetup.c:500 src/cryptsetup_reencrypt.c:1230
-#: src/cryptsetup_reencrypt.c:1231
+#: src/cryptsetup.c:1101 src/cryptsetup.c:1102 src/cryptsetup.c:1103
+#: src/cryptsetup.c:1104 src/veritysetup.c:379 src/veritysetup.c:380
+#: src/veritysetup.c:382 src/cryptsetup_reencrypt.c:1158
+#: src/cryptsetup_reencrypt.c:1159 src/cryptsetup_reencrypt.c:1160
+#: src/cryptsetup_reencrypt.c:1161
 msgid "bytes"
 msgstr "байти"
 
-#: src/cryptsetup.c:1290 src/cryptsetup_reencrypt.c:1230
+#: src/cryptsetup.c:1102 src/cryptsetup_reencrypt.c:1158
 msgid "Number of bytes to skip in keyfile"
 msgstr "Кількість байтів, які слід пропустити у файлі ключа"
 
-#: src/cryptsetup.c:1291
+#: src/cryptsetup.c:1103
 msgid "Limits the read from newly added keyfile"
 msgstr "Обмежує читання з щойно доданого файла ключа"
 
-#: src/cryptsetup.c:1292
+#: src/cryptsetup.c:1104
 msgid "Number of bytes to skip in newly added keyfile"
 msgstr "Кількість байтів, які слід пропустити у щойно доданому файлі ключа"
 
-#: src/cryptsetup.c:1293
+#: src/cryptsetup.c:1105
 msgid "Slot number for new key (default is first free)"
 msgstr "Номер слоту для нового ключа (типовим слотом є перший вільний слот)"
 
-#: src/cryptsetup.c:1294
+#: src/cryptsetup.c:1106
 msgid "The size of the device"
 msgstr "Розмір пристрою"
 
-#: src/cryptsetup.c:1294 src/cryptsetup.c:1295 src/cryptsetup.c:1296
-#: src/cryptsetup.c:1302 src/cryptsetup_reencrypt.c:1232
+#: src/cryptsetup.c:1106 src/cryptsetup.c:1107 src/cryptsetup.c:1108
+#: src/cryptsetup.c:1114
 msgid "SECTORS"
 msgstr "СЕКТОРИ"
 
-#: src/cryptsetup.c:1295
+#: src/cryptsetup.c:1107
 msgid "The start offset in the backend device"
 msgstr "Початковий відступ на допоміжному пристрої"
 
-#: src/cryptsetup.c:1296
+#: src/cryptsetup.c:1108
 msgid "How many sectors of the encrypted data to skip at the beginning"
 msgstr "Кількість секторів зашифрованих даних, які слід пропустити на початку"
 
-#: src/cryptsetup.c:1297
+#: src/cryptsetup.c:1109
 msgid "Create a readonly mapping"
 msgstr "Створити призначення у режимі лише читання"
 
-#: src/cryptsetup.c:1298 src/cryptsetup_reencrypt.c:1221
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "PBKDF2 iteration time for LUKS (in ms)"
 msgstr "Тривалість ітерації PBKDF2 для LUKS (у мс)"
 
-#: src/cryptsetup.c:1298 src/cryptsetup_reencrypt.c:1221
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "msecs"
 msgstr "мс"
 
-#: src/cryptsetup.c:1299 src/cryptsetup_reencrypt.c:1222
+#: src/cryptsetup.c:1111 src/cryptsetup_reencrypt.c:1150
 msgid "Do not ask for confirmation"
 msgstr "Не питати про підтвердження"
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1112
 msgid "Timeout for interactive passphrase prompt (in seconds)"
 msgstr "Час очікування у інтерактивному запиті щодо пароля (у секундах)"
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1112
 msgid "secs"
 msgstr "секунди"
 
-#: src/cryptsetup.c:1301 src/cryptsetup_reencrypt.c:1223
+#: src/cryptsetup.c:1113 src/cryptsetup_reencrypt.c:1151
 msgid "How often the input of the passphrase can be retried"
 msgstr "Частота повторень спроб отримання вхідних даних пароля"
 
-#: src/cryptsetup.c:1302
+#: src/cryptsetup.c:1114
 msgid "Align payload at <n> sector boundaries - for luksFormat"
 msgstr "Вирівняти дані за областями у <n> секторів, для luksFormat"
 
-#: src/cryptsetup.c:1303
+#: src/cryptsetup.c:1115
 msgid "File with LUKS header and keyslots backup."
 msgstr "Файл з заголовком LUKS та резервною копію слотів ключів."
 
-#: src/cryptsetup.c:1304 src/cryptsetup_reencrypt.c:1224
+#: src/cryptsetup.c:1116 src/cryptsetup_reencrypt.c:1152
 msgid "Use /dev/random for generating volume key."
 msgstr "Використовувати для створення ключа тому /dev/random."
 
-#: src/cryptsetup.c:1305 src/cryptsetup_reencrypt.c:1225
+#: src/cryptsetup.c:1117 src/cryptsetup_reencrypt.c:1153
 msgid "Use /dev/urandom for generating volume key."
 msgstr "Використовувати для створення ключа тому /dev/urandom."
 
-#: src/cryptsetup.c:1306
+#: src/cryptsetup.c:1118
 msgid "Share device with another non-overlapping crypt segment."
 msgstr "Використовувати пристрій спільно з іншим сегментом шифрування, без перекриття."
 
-#: src/cryptsetup.c:1307 src/veritysetup.c:503
+#: src/cryptsetup.c:1119 src/veritysetup.c:385
 msgid "UUID for device to use."
 msgstr "UUID пристрою, який слід використати."
 
-#: src/cryptsetup.c:1308
+#: src/cryptsetup.c:1120
 msgid "Allow discards (aka TRIM) requests for device."
 msgstr "Дозволити запити відкидання (або TRIM) до пристрою."
 
-#: src/cryptsetup.c:1309
+#: src/cryptsetup.c:1121
 msgid "Device or file with separated LUKS header."
 msgstr "Пристрій або файл з окремим заголовком LUKS."
 
-#: src/cryptsetup.c:1310
+#: src/cryptsetup.c:1122
 msgid "Do not activate device, just check passphrase."
 msgstr "Не задіювати пристрій, просто перевірити пароль."
 
-#: src/cryptsetup.c:1329 src/veritysetup.c:520
+#: src/cryptsetup.c:1140 src/veritysetup.c:402
 msgid "[OPTION...] <action> <action-specific>"
 msgstr "[ПАРАМЕТР...] <дія> <параметри_дії>"
 
-#: src/cryptsetup.c:1369 src/veritysetup.c:557
+#: src/cryptsetup.c:1180 src/veritysetup.c:439
 msgid "Argument <action> missing."
 msgstr "Не вказано аргумент <дія>."
 
-#: src/cryptsetup.c:1375 src/veritysetup.c:563
+#: src/cryptsetup.c:1186 src/veritysetup.c:445
 msgid "Unknown action."
 msgstr "Невідома дія."
 
-#: src/cryptsetup.c:1390 src/veritysetup.c:578
+#: src/cryptsetup.c:1201 src/veritysetup.c:460
 #, c-format
 msgid "%s: requires %s as arguments"
 msgstr "%s: слід вказати у параметрах %s"
 
-#: src/cryptsetup.c:1399
+#: src/cryptsetup.c:1210
 msgid "Option --shared is allowed only for create operation.\n"
 msgstr "Параметр --shared можна використовувати лише для дії create.\n"
 
-#: src/cryptsetup.c:1407
+#: src/cryptsetup.c:1218
 msgid "Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"
 msgstr "Параметр --allow-discards можна використовувати лише для дій luksOpen, loopaesOpen і create.\n"
 
-#: src/cryptsetup.c:1415
+#: src/cryptsetup.c:1226
 msgid ""
 "Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n"
 "To limit read from keyfile use --keyfile-size=(bytes)."
@@ -1175,100 +1147,105 @@ msgstr ""
 "Параметр --key-size можна використовувати лише для дій luksFormat, create і loopaesOpen.\n"
 "Щоб обмежити читання з файла ключа, скористайтеся параметром --keyfile-size=(об’єм у байтах)."
 
-#: src/cryptsetup.c:1422
+#: src/cryptsetup.c:1233
 msgid "Option --test-passphrase is allowed only for luksOpen.\n"
 msgstr "Параметр --test-passphrase можна використовувати лише для luksOpen.\n"
 
-#: src/cryptsetup.c:1427 src/cryptsetup_reencrypt.c:1298
+#: src/cryptsetup.c:1238 src/cryptsetup_reencrypt.c:1221
 msgid "Key size must be a multiple of 8 bits"
 msgstr "Розмір ключа має бути кратним 8 бітам"
 
-#: src/cryptsetup.c:1434 src/cryptsetup_reencrypt.c:1303
+#: src/cryptsetup.c:1245 src/cryptsetup_reencrypt.c:1226
 msgid "Key slot is invalid."
 msgstr "Некоректний слот ключа."
 
-#: src/cryptsetup.c:1441
+#: src/cryptsetup.c:1252
 msgid "Option --key-file takes precedence over specified key file argument.\n"
 msgstr "Параметр --key-file має пріоритет над вказаним параметром файла ключа.\n"
 
-#: src/cryptsetup.c:1449 src/veritysetup.c:585 src/cryptsetup_reencrypt.c:1282
+#: src/cryptsetup.c:1260 src/veritysetup.c:467 src/cryptsetup_reencrypt.c:1210
 msgid "Negative number for option not permitted."
 msgstr "Не можна використовувати від’ємні значення для параметра."
 
-#: src/cryptsetup.c:1453 src/cryptsetup_reencrypt.c:1275
-#: src/cryptsetup_reencrypt.c:1307
+#: src/cryptsetup.c:1264 src/cryptsetup_reencrypt.c:1204
+#: src/cryptsetup_reencrypt.c:1230
 msgid "Only one of --use-[u]random options is allowed."
 msgstr "Можна використовувати лише один з параметрів --use-[u]random."
 
-#: src/cryptsetup.c:1457
+#: src/cryptsetup.c:1268
 msgid "Option --use-[u]random is allowed only for luksFormat."
 msgstr "Параметр --use-[u]random можна використовувати лише для дії luksFormat."
 
-#: src/cryptsetup.c:1461
+#: src/cryptsetup.c:1272
 msgid "Option --uuid is allowed only for luksFormat and luksUUID."
 msgstr "Параметр --uuid можна використовувати лише для дій luksFormat і luksUUID."
 
-#: src/cryptsetup.c:1465
+#: src/cryptsetup.c:1276
 msgid "Option --align-payload is allowed only for luksFormat."
 msgstr "Параметр --align-payload можна використовувати лише для дії luksFormat."
 
-#: src/cryptsetup.c:1470
+#: src/cryptsetup.c:1281
 msgid "Option --skip is supported only for create and loopaesOpen commands.\n"
 msgstr "Підтримку параметра --skip передбачено лише для дій create і loopaesOpen.\n"
 
-#: src/cryptsetup.c:1475
+#: src/cryptsetup.c:1286
 msgid "Option --offset is supported only for create and loopaesOpen commands.\n"
 msgstr "Підтримку параметра --offset передбачено лише для дій create і loopaesOpen.\n"
 
-#: src/veritysetup.c:118
+#: src/veritysetup.c:56
 msgid "Invalid salt string specified.\n"
 msgstr "Вказано некоректний рядок солі.\n"
 
-#: src/veritysetup.c:198
+#: src/veritysetup.c:89
+#, c-format
+msgid "Cannot create hash image %s for writing.\n"
+msgstr "Не вдалося створити образ хешу %s для запису.\n"
+
+#: src/veritysetup.c:148
 msgid "Invalid root hash string specified.\n"
 msgstr "Вказано некоректний рядок кореневого хешу.\n"
 
-#: src/veritysetup.c:382
+#: src/veritysetup.c:308
 msgid "<data_device> <hash_device>"
 msgstr "<пристрій_даних> <пристрій_хешу>"
 
-#: src/veritysetup.c:382
+#: src/veritysetup.c:308
 msgid "format device"
 msgstr "форматувати пристрій"
 
-#: src/veritysetup.c:383
+#: src/veritysetup.c:309
 msgid "<data_device> <hash_device> <root_hash>"
 msgstr "<пристрій_даних> <пристрій_хешу> <кореневий_хеш>"
 
-#: src/veritysetup.c:383
+#: src/veritysetup.c:309
 msgid "verify device"
 msgstr "перевірити пристрій"
 
-#: src/veritysetup.c:384
+#: src/veritysetup.c:310
 msgid "<name> <data_device> <hash_device> <root_hash>"
 msgstr "<назва> <пристрій_даних> <пристрій_хешу> <кореневий_хеш>"
 
-#: src/veritysetup.c:384
+#: src/veritysetup.c:310
 msgid "create active device"
 msgstr "створити активний пристрій"
 
-#: src/veritysetup.c:385
+#: src/veritysetup.c:311
 msgid "remove (deactivate) device"
 msgstr "вилучити пристрій (скасувати активацію)"
 
-#: src/veritysetup.c:386
+#: src/veritysetup.c:312
 msgid "show active device status"
 msgstr "показати стан активного пристрою"
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:313
 msgid "<hash_device>"
 msgstr "<пристрій_хешу>"
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:313
 msgid "show on-disk information"
 msgstr "показати вбудовані дані"
 
-#: src/veritysetup.c:406
+#: src/veritysetup.c:332
 #, c-format
 msgid ""
 "\n"
@@ -1283,7 +1260,7 @@ msgstr ""
 "<пристрій_хешу> — пристрій, на якому зберігаються дані для перевірки\n"
 "<кореневий_хеш> — хеш кореневого вузла на пристрої <пристрій_хешу>\n"
 
-#: src/veritysetup.c:413
+#: src/veritysetup.c:339
 #, c-format
 msgid ""
 "\n"
@@ -1294,240 +1271,290 @@ msgstr ""
 "Типові вбудовані параметри dm-verity:\n"
 "\tхеш: %s, блок даних (у байтах): %u, блок хешу (у байтах): %u, розмір солі: %u, формат хешування: %u\n"
 
-#: src/veritysetup.c:495
+#: src/veritysetup.c:377
 msgid "Do not use verity superblock"
 msgstr "Не використовувати суперблок verity"
 
-#: src/veritysetup.c:496
+#: src/veritysetup.c:378
 msgid "Format type (1 - normal, 0 - original Chrome OS)"
 msgstr "Тип форматування (1 — звичайне, 0 — початкове Chrome OS)"
 
-#: src/veritysetup.c:496
+#: src/veritysetup.c:378
 msgid "number"
 msgstr "номер"
 
-#: src/veritysetup.c:497
+#: src/veritysetup.c:379
 msgid "Block size on the data device"
 msgstr "Розмір блоку на пристрої даних"
 
-#: src/veritysetup.c:498
+#: src/veritysetup.c:380
 msgid "Block size on the hash device"
 msgstr "Розмір блоку на пристрої хешу"
 
-#: src/veritysetup.c:499
+#: src/veritysetup.c:381
 msgid "The number of blocks in the data file"
 msgstr "Кількість блоків у файлі даних"
 
-#: src/veritysetup.c:499
+#: src/veritysetup.c:381
 msgid "blocks"
 msgstr "блоки"
 
-#: src/veritysetup.c:500
+#: src/veritysetup.c:382
 msgid "Starting offset on the hash device"
 msgstr "Початковий відступ на пристрої хешу"
 
-#: src/veritysetup.c:501
+#: src/veritysetup.c:383
 msgid "Hash algorithm"
 msgstr "Алгоритм хешування"
 
-#: src/veritysetup.c:501
+#: src/veritysetup.c:383
 msgid "string"
 msgstr "рядок"
 
-#: src/veritysetup.c:502
+#: src/veritysetup.c:384
 msgid "Salt"
 msgstr "Сіль"
 
-#: src/veritysetup.c:502
+#: src/veritysetup.c:384
 msgid "hex string"
 msgstr "шістнадцятковий рядок"
 
-#: src/cryptsetup_reencrypt.c:220
+#: src/cryptsetup_reencrypt.c:164
 #, c-format
 msgid "Cannot exclusively open %s, device in use.\n"
 msgstr "Не можна відкрити %s у виключному режимі, пристрій вже використовується.\n"
 
-#: src/cryptsetup_reencrypt.c:224
+#: src/cryptsetup_reencrypt.c:168
 #, c-format
 msgid "Cannot open device %s\n"
 msgstr "Не вдалося відкрити пристрій %s\n"
 
-#: src/cryptsetup_reencrypt.c:234 src/cryptsetup_reencrypt.c:460
-#: src/cryptsetup_reencrypt.c:870
+#: src/cryptsetup_reencrypt.c:178 src/cryptsetup_reencrypt.c:406
+#: src/cryptsetup_reencrypt.c:822
 msgid "Allocation of aligned memory failed.\n"
 msgstr "Спроба розподілу вирівняних ділянок пам’яті зазнала невдачі.\n"
 
-#: src/cryptsetup_reencrypt.c:252
+#: src/cryptsetup_reencrypt.c:185
+#, c-format
+msgid "Cannot read device %s.\n"
+msgstr "Не вдалося виконати читання з пристрою %s.\n"
+
+#: src/cryptsetup_reencrypt.c:196
 #, c-format
 msgid "Marking LUKS device %s unusable.\n"
 msgstr "Позначаємо пристрій LUKS %s як непридатний.\n"
 
-#: src/cryptsetup_reencrypt.c:257
+#: src/cryptsetup_reencrypt.c:201
 #, c-format
 msgid "Marking LUKS device %s usable.\n"
 msgstr "Позначаємо пристрій LUKS %s як придатний\n"
 
-#: src/cryptsetup_reencrypt.c:273
+#: src/cryptsetup_reencrypt.c:217
 #, c-format
 msgid "Cannot write device %s.\n"
 msgstr "Не вдалося виконати запис на пристрій %s.\n"
 
-#: src/cryptsetup_reencrypt.c:352
+#: src/cryptsetup_reencrypt.c:298
 msgid "Cannot write reencryption log file.\n"
 msgstr "Не вдалося записати файл журналу повторного шифрування.\n"
 
-#: src/cryptsetup_reencrypt.c:401
+#: src/cryptsetup_reencrypt.c:347
 msgid "Cannot read reencryption log file.\n"
 msgstr "Не вдалося прочитати файл журналу повторного шифрування.\n"
 
-#: src/cryptsetup_reencrypt.c:451
+#: src/cryptsetup_reencrypt.c:397
 #, c-format
-msgid "Log file %s exists, restarting reencryption.\n"
-msgstr "Файл журналу %s вже існує, перезапускаємо повторне шифрування.\n"
+msgid "Log file %s exists, resuming reencryption.\n"
+msgstr "Файл журналу %s вже існує, поновлюємо повторне шифрування.\n"
 
-#: src/cryptsetup_reencrypt.c:505
+#: src/cryptsetup_reencrypt.c:451
 msgid "Activation of temporary devices failed.\n"
 msgstr "Спроба задіяти тимчасові пристрої зазнала невдачі.\n"
 
-#: src/cryptsetup_reencrypt.c:530
+#: src/cryptsetup_reencrypt.c:476
 #, c-format
 msgid "New LUKS header for device %s created.\n"
 msgstr "Створено новий заголовок LUKS для пристрою %s.\n"
 
-#: src/cryptsetup_reencrypt.c:538
+#: src/cryptsetup_reencrypt.c:484
 #, c-format
 msgid "Activated keyslot %i.\n"
 msgstr "Задіяний слот ключа %i.\n"
 
-#: src/cryptsetup_reencrypt.c:562
+#: src/cryptsetup_reencrypt.c:508
 #, c-format
 msgid "LUKS header backup of device %s created.\n"
 msgstr "Створено резервну копію заголовка LUKS пристрою %s.\n"
 
-#: src/cryptsetup_reencrypt.c:590
+#: src/cryptsetup_reencrypt.c:536
 msgid "Creation of LUKS backup headers failed.\n"
 msgstr "Спроба створення заголовків резервних копій LUKS зазнала невдачі.\n"
 
-#: src/cryptsetup_reencrypt.c:685
+#: src/cryptsetup_reencrypt.c:631
 #, c-format
 msgid "Cannot restore LUKS header on device %s.\n"
 msgstr "Не вдалося відновити заголовок LUKS на пристрої %s.\n"
 
-#: src/cryptsetup_reencrypt.c:687
+#: src/cryptsetup_reencrypt.c:633
 #, c-format
 msgid "LUKS header on device %s restored.\n"
 msgstr "Відновлено заголовок LUKS на пристрої %s.\n"
 
-#: src/cryptsetup_reencrypt.c:719
+#: src/cryptsetup_reencrypt.c:665
 #, c-format
 msgid "Progress: %5.1f%%, ETA %02llu:%02llu, %4llu MiB written, speed %5.1f MiB/s%s"
 msgstr "Поступ: %5.1f%%, час до завершення: %02llu:%02llu, записано %4llu МіБ, швидкість %5.1f МіБ/с%s"
 
-#: src/cryptsetup_reencrypt.c:735 src/cryptsetup_reencrypt.c:807
+#: src/cryptsetup_reencrypt.c:681 src/cryptsetup_reencrypt.c:757
 msgid "Cannot seek to device offset.\n"
 msgstr "Не вдалося встановити вказану позицію на пристрої.\n"
 
-#: src/cryptsetup_reencrypt.c:853 src/cryptsetup_reencrypt.c:859
+#: src/cryptsetup_reencrypt.c:803 src/cryptsetup_reencrypt.c:809
 msgid "Cannot open temporary LUKS header file.\n"
 msgstr "Не вдалося відкрити файл тимчасового заголовка LUKS.\n"
 
-#: src/cryptsetup_reencrypt.c:865
+#: src/cryptsetup_reencrypt.c:815
 msgid "Cannot get device size.\n"
 msgstr "Не вдалося отримати дані щодо розміру пристрою.\n"
 
-#: src/cryptsetup_reencrypt.c:887
+#: src/cryptsetup_reencrypt.c:839
 msgid "Interrupted by a signal.\n"
 msgstr "Перервано за сигналом.\n"
 
-#: src/cryptsetup_reencrypt.c:889
+#: src/cryptsetup_reencrypt.c:841
 msgid "IO error during reencryption.\n"
 msgstr "Помилка введення-виведення під час повторного шифрування.\n"
 
-#: src/cryptsetup_reencrypt.c:990
+#: src/cryptsetup_reencrypt.c:942
 msgid "Key file can be used only with --key-slot or with exactly one key slot active.\n"
 msgstr "Файлом ключа можна користуватися лише з --key-slot, або якщо активним є лише один слот ключа.\n"
 
-#: src/cryptsetup_reencrypt.c:1032
+#: src/cryptsetup_reencrypt.c:984
 msgid "Enter any LUKS passphrase: "
 msgstr "Введіть довільний пароль LUKS: "
 
-#: src/cryptsetup_reencrypt.c:1039
+#: src/cryptsetup_reencrypt.c:991
 #, c-format
 msgid "Enter LUKS passphrase for key slot %u: "
 msgstr "Вкажіть пароль LUKS для слоту ключа %u: "
 
-#: src/cryptsetup_reencrypt.c:1088
+#: src/cryptsetup_reencrypt.c:1040
 msgid "Cannot open reencryption log file.\n"
 msgstr "Не вдалося відкрити файл журналу повторного шифрування.\n"
 
-#: src/cryptsetup_reencrypt.c:1216
+#: src/cryptsetup_reencrypt.c:1144
 msgid "Reencryption block size"
 msgstr "Розмір блоку повторного шифрування"
 
-#: src/cryptsetup_reencrypt.c:1216
+#: src/cryptsetup_reencrypt.c:1144
 msgid "MiB"
 msgstr "МіБ"
 
-#: src/cryptsetup_reencrypt.c:1226
+#: src/cryptsetup_reencrypt.c:1154
 msgid "Use direct-io when accesing devices."
 msgstr "Використовувати безпосереднє введення-виведення під час доступу до пристроїв."
 
-#: src/cryptsetup_reencrypt.c:1227
+#: src/cryptsetup_reencrypt.c:1155
 msgid "Use fsync after each block."
 msgstr "Використовувати fsync після кожного блоку."
 
-#: src/cryptsetup_reencrypt.c:1228
+#: src/cryptsetup_reencrypt.c:1156
 msgid "Update log file after every block."
 msgstr "Оновлювати файл журналу після кожного блоку."
 
-#: src/cryptsetup_reencrypt.c:1229
+#: src/cryptsetup_reencrypt.c:1157
 msgid "Use only this slot (others will be disabled)."
 msgstr "Використовувати лише цей слот (інші буде вимкнено)."
 
-#: src/cryptsetup_reencrypt.c:1232
+#: src/cryptsetup_reencrypt.c:1160
 msgid "Reduce data device size (move data offset). DANGEROUS!"
 msgstr "Зменшити розмір пристрою зберігання даних (змістити відступ даних). НЕБЕЗПЕЧНО!"
 
-#: src/cryptsetup_reencrypt.c:1233
+#: src/cryptsetup_reencrypt.c:1161
+msgid "Use only specified device size (ignore rest of device). DANGEROUS!"
+msgstr "Використовувати лише вказаний розмір пристрою (ігнорувати решту об’єму). НЕБЕЗПЕЧНО!"
+
+#: src/cryptsetup_reencrypt.c:1162
 msgid "Create new header on not encrypted device."
 msgstr "Створити новий заголовок на незашифрованому пристрої."
 
-#: src/cryptsetup_reencrypt.c:1249
+#: src/cryptsetup_reencrypt.c:1178
 msgid "[OPTION...] <device>"
 msgstr "[ПАРАМЕТР...] <пристрій>"
 
-#: src/cryptsetup_reencrypt.c:1263
+#: src/cryptsetup_reencrypt.c:1192
 msgid "WARNING: this is experimental code, it can completely break your data.\n"
 msgstr "ПОПЕРЕДЖЕННЯ: цей код не перевірено достатнім чином, його використання може призвести до незворотного пошкодження даних.\n"
 
-#: src/cryptsetup_reencrypt.c:1264
+#: src/cryptsetup_reencrypt.c:1193
 #, c-format
 msgid "Reencryption will change: volume key%s%s%s%s.\n"
 msgstr "Повторне шифрування призведе до зміни: ключа тому%s%s%s%s.\n"
 
-#: src/cryptsetup_reencrypt.c:1265
+#: src/cryptsetup_reencrypt.c:1194
 msgid ", set hash to "
 msgstr ", встановити хеш у значення "
 
-#: src/cryptsetup_reencrypt.c:1266
+#: src/cryptsetup_reencrypt.c:1195
 msgid ", set cipher to "
 msgstr ", встановити шифрування "
 
-#: src/cryptsetup_reencrypt.c:1271
+#: src/cryptsetup_reencrypt.c:1200
 msgid "Argument required."
 msgstr "Слід вказати аргумент."
 
-#: src/cryptsetup_reencrypt.c:1288
-msgid "Only values between 1MiB and 64 MiB allowed for reencryption block size."
+#: src/cryptsetup_reencrypt.c:1216
+msgid "Only values between 1 MiB and 64 MiB allowed for reencryption block size."
 msgstr "Розмір блоку повторного шифрування повинен належати діапазону від 1 МіБ до 64 МІБ."
 
-#: src/cryptsetup_reencrypt.c:1293
+#: src/cryptsetup_reencrypt.c:1235 src/cryptsetup_reencrypt.c:1240
+msgid "Invalid device size specification."
+msgstr "Некоректна специфікація розміру пристрою."
+
+#: src/cryptsetup_reencrypt.c:1243
 msgid "Maximum device reduce size is 64 MiB."
 msgstr "Максимальний розмір зменшення розміру пристрою дорівнює 64 МіБ."
 
-#: src/cryptsetup_reencrypt.c:1311
-msgid "Option --new must be used together with --reduce_device_size."
-msgstr "Параметр --new слід використовувати разом з --reduce_device_size."
+#: src/cryptsetup_reencrypt.c:1246
+msgid "Reduce size must be multiple of 512 bytes sector."
+msgstr "Розмір зменшення має бути кратним до 512-байтового сектора."
+
+#: src/cryptsetup_reencrypt.c:1250
+msgid "Option --new must be used together with --reduce-device-size."
+msgstr "Параметр --new слід використовувати разом з --reduce-device-size."
+
+#: src/utils_tools.c:114
+msgid "Command successful.\n"
+msgstr "Команду виконано успішно.\n"
+
+#: src/utils_tools.c:128
+#, c-format
+msgid "Command failed with code %i"
+msgstr "Спроба виконання команди завершилася повідомленням про помилку з кодом %i"
+
+#~ msgid "Cannot open device %s for %s%s access.\n"
+#~ msgstr "Не вдалося відкрити пристрій %s для доступу %s%s.\n"
+
+#~ msgid "exclusive "
+#~ msgstr "ексклюзивний "
+
+#~ msgid "writable"
+#~ msgstr "придатний до запису"
+
+#~ msgid "read-only"
+#~ msgstr "тільки читання"
+
+#~ msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
+#~ msgstr "УВАГА!!! Небезпека доступу до даних у пам’яті. Працюєте від імені адміністратора?\n"
+
+#~ msgid "Unable to obtain sector size for %s"
+#~ msgstr "Не вдалося отримати розмір сектора %s"
+
+#~ msgid "Failed to write to key storage.\n"
+#~ msgstr "Не вдалося виконати запис до сховища ключів.\n"
+
+#~ msgid "Failed to read from key storage.\n"
+#~ msgstr "Не вдалося виконати читання даних зі сховища ключів.\n"
 
 #~ msgid "Device %s is busy.\n"
 #~ msgstr "Пристрій %s зайнято.\n"
diff --git a/po/vi.po b/po/vi.po
index 0ab8c03..6099bf2 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cryptsetup-1.5.0-rc2\n"
+"Project-Id-Version: cryptsetup-1.5.1\n"
 "Report-Msgid-Bugs-To: dm-crypt@saout.de\n"
-"POT-Creation-Date: 2012-06-20 11:31+0200\n"
-"PO-Revision-Date: 2012-06-24 08:46+0700\n"
+"POT-Creation-Date: 2012-09-19 15:48+0200\n"
+"PO-Revision-Date: 2012-10-14 14:51+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -18,15 +18,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
-"X-Poedit-Language: Vietnamese\n"
-"X-Poedit-Country: VIET NAM\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/libdevmapper.c:199
+#: lib/libdevmapper.c:230
+msgid "Cannot initialize device-mapper, running as non-root user.\n"
+msgstr "Không thể khởi tạo ánh-xạ-thiết-bị (device-mapper), do không chạy dưới quyền siêu người dùng.\n"
+
+#: lib/libdevmapper.c:233
 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n"
-msgstr "Không thể sơ khởi tiến trình ánh xạ thiết bị. Mô-đun hạt nhân \"dm_mod\" được nạp chưa?\n"
+msgstr "Không thể khởi tạo tiến trình ánh xạ thiết bị. Mô-đun hạt nhân`dm_mod'  được nạp chưa?\n"
 
-#: lib/libdevmapper.c:492
+#: lib/libdevmapper.c:516
 #, c-format
 msgid "DM-UUID for device %s was truncated.\n"
 msgstr "Mã số DM-UUID cho thiết bị %s bị cắt bớt.\n"
@@ -57,323 +59,264 @@ msgstr "Không hiểu chất lượng RNG đã yêu cầu.\n"
 msgid "Error %d reading from RNG: %s\n"
 msgstr "Lỗi %d khi đọc một từ RNG: %s\n"
 
-#: lib/setup.c:172
+#: lib/setup.c:179
 msgid "Cannot initialize crypto RNG backend.\n"
-msgstr "Không thể khởi tạo ứng dụng chạy ở phía sau (backend) mật mã RNG.\n"
+msgstr "Không thể khởi tạo ứng dụng chạy ở phía sau (backend) mã hóa RNG.\n"
 
-#: lib/setup.c:178
+#: lib/setup.c:185
 msgid "Cannot initialize crypto backend.\n"
-msgstr "Không thể sơ khởi hậu phương mật mã.\n"
+msgstr "Không thể khởi ứng dụng mã hóa chạy ở phía sau (backend).\n"
 
-#: lib/setup.c:201 lib/setup.c:1096 lib/verity/verity.c:119
+#: lib/setup.c:208 lib/setup.c:1060 lib/verity/verity.c:120
 #, c-format
 msgid "Hash algorithm %s not supported.\n"
 msgstr "Thuật toán băm %s không được hỗ trợ.\n"
 
-#: lib/setup.c:204 lib/loopaes/loopaes.c:88
+#: lib/setup.c:211 lib/loopaes/loopaes.c:88
 #, c-format
 msgid "Key processing error (using hash %s).\n"
 msgstr "Lỗi xử lý khoá (dùng mã băm %s).\n"
 
-#: lib/setup.c:245
+#: lib/setup.c:252
 msgid "All key slots full.\n"
 msgstr "Mọi khe khoá đều bị đầy.\n"
 
-#: lib/setup.c:252
+#: lib/setup.c:259
 #, c-format
 msgid "Key slot %d is invalid, please select between 0 and %d.\n"
 msgstr "Khe khoá %d không đúng, hãy chọn một giá trị trong phạm vi 0 đến %d.\n"
 
-#: lib/setup.c:258
+#: lib/setup.c:265
 #, c-format
 msgid "Key slot %d is full, please select another one.\n"
 msgstr "Khe khoá %d bị đầy, hãy chọn một khe khác.\n"
 
-#: lib/setup.c:372
+#: lib/setup.c:379
 #, c-format
 msgid "Enter passphrase for %s: "
 msgstr "Gõ cụm từ mật khẩu cho %s: "
 
-#: lib/setup.c:521
-msgid "Cannot find a free loopback device.\n"
-msgstr "Không tìm thấy thiết bị vòng ngược (loopback ) nào còn rảnh.\n"
-
-#: lib/setup.c:528
-msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
-msgstr "Gặp lỗi khi gắn thiết bị vòng lặp (loopback) (thiết bị lặp với cờ autoclear là bắt buộc).\n"
-
-#: lib/setup.c:601
+#: lib/setup.c:560
 #, c-format
 msgid "Header detected but device %s is too small.\n"
 msgstr "Phát hiện được phần đầu nhưng mà thiết bị %s quá nhỏ.\n"
 
-#: lib/setup.c:617 lib/setup.c:1312
+#: lib/setup.c:576 lib/setup.c:1278
 msgid "This operation is not supported for this device type.\n"
 msgstr "Thao tác này không được hỗ trợ cho kiểu thiết bị này.\n"
 
-#: lib/setup.c:829 lib/setup.c:1276 lib/setup.c:2076
+#: lib/setup.c:782 lib/setup.c:1242 lib/setup.c:2034
 #, c-format
 msgid "Device %s is not active.\n"
 msgstr "Thiết bị %s không hoạt động.\n"
 
-#: lib/setup.c:846
+#: lib/setup.c:799
 #, c-format
 msgid "Underlying device for crypt device %s disappeared.\n"
 msgstr "Thiết bị nằm dưới cho thiết bị crypt %s đã bị biến mất.\n"
 
-#: lib/setup.c:909
+#: lib/setup.c:862
 msgid "Invalid plain crypt parameters.\n"
-msgstr "Sai lập tham số mật mã bình thường.\n"
+msgstr "Đặt sai tham số mã hóa bình thường.\n"
 
-#: lib/setup.c:914 lib/setup.c:1025
+#: lib/setup.c:867 lib/setup.c:989
 msgid "Invalid key size.\n"
 msgstr "Kích cỡ khoá không đúng.\n"
 
-#: lib/setup.c:958
+#: lib/setup.c:911
 msgid "Can't format LUKS without device.\n"
 msgstr "Không thể định dạng LUKS mà không có thiết bị.\n"
 
-#: lib/setup.c:999
+#: lib/setup.c:959
 #, c-format
 msgid "Cannot format device %s which is still in use.\n"
 msgstr "Không thể định dạng thiết bị %s mà nó lại vẫn đang được sử dụng.\n"
 
-#: lib/setup.c:1002
+#: lib/setup.c:962
+#, c-format
+msgid "Cannot format device %s, permission denied.\n"
+msgstr "Không thể định dạng thiết bị %s, không đủ thẩm quyền.\n"
+
+#: lib/setup.c:966
 #, c-format
 msgid "Cannot wipe header on device %s.\n"
 msgstr "Không thể tẩy xoá phần đầu trên thiết bị %s.\n"
 
-#: lib/setup.c:1020
+#: lib/setup.c:984
 msgid "Can't format LOOPAES without device.\n"
 msgstr "Không thể định dạng LOOPAES bên ngoài thiết bị.\n"
 
-#: lib/setup.c:1056
+#: lib/setup.c:1020
 msgid "Can't format VERITY without device.\n"
 msgstr "Không thể định dạng VERITY mà không có thiết bị.\n"
 
-#: lib/setup.c:1064 lib/verity/verity.c:102
+#: lib/setup.c:1028 lib/verity/verity.c:103
 #, c-format
 msgid "Unsupported VERITY hash type %d.\n"
 msgstr "Kiểu băm VERITY %d không được hỗ trợ.\n"
 
-#: lib/setup.c:1070 lib/verity/verity.c:110
+#: lib/setup.c:1034 lib/verity/verity.c:111
 msgid "Unsupported VERITY block size.\n"
 msgstr "Kích thước khối VERITY không được hỗ trợ.\n"
 
-#: lib/setup.c:1075 lib/verity/verity.c:73
+#: lib/setup.c:1039 lib/verity/verity.c:74
 msgid "Unsupported VERITY hash offset.\n"
 msgstr "Khoảng bù (offset) mã băm VERITY không được hỗ trợ.\n"
 
-#: lib/setup.c:1185
+#: lib/setup.c:1151
 #, c-format
 msgid "Unknown crypt device type %s requested.\n"
-msgstr "Không rõ kiểu thiết bị mật mã %s được yêu cầu.\n"
+msgstr "Không rõ kiểu thiết bị mã hóa %s được yêu cầu.\n"
 
-#: lib/setup.c:1327
+#: lib/setup.c:1293
 msgid "Do you really want to change UUID of device?"
 msgstr "Bạn có thực sự muốn thay đổi UUID cho thiết bị?"
 
-#: lib/setup.c:1418 lib/setup.c:1465 lib/setup.c:1514 lib/setup.c:1580
-#: lib/setup.c:1656 lib/setup.c:1737 lib/setup.c:1783 lib/setup.c:2141
-#: lib/setup.c:2419
+#: lib/setup.c:1379 lib/setup.c:1424 lib/setup.c:1473 lib/setup.c:1539
+#: lib/setup.c:1615 lib/setup.c:1696 lib/setup.c:1742 lib/setup.c:2099
+#: lib/setup.c:2382
 msgid "This operation is supported only for LUKS device.\n"
 msgstr "Thao tác này được hỗ trợ chỉ cho thiết bị LUKS.\n"
 
-#: lib/setup.c:1425
+#: lib/setup.c:1386
 #, c-format
 msgid "Volume %s is not active.\n"
 msgstr "Khối tin %s không hoạt động.\n"
 
-#: lib/setup.c:1437
+#: lib/setup.c:1397
 #, c-format
 msgid "Volume %s is already suspended.\n"
 msgstr "Khối %s đã bị ngưng.\n"
 
-#: lib/setup.c:1475 lib/setup.c:1524
+#: lib/setup.c:1434 lib/setup.c:1483
 #, c-format
 msgid "Volume %s is not suspended.\n"
 msgstr "Khối %s không bị ngưng.\n"
 
-#: lib/setup.c:1531 lib/setup.c:1908 lib/setup.c:1922 src/cryptsetup.c:343
+#: lib/setup.c:1490 lib/setup.c:1867 lib/setup.c:1881 src/cryptsetup.c:194
 msgid "Enter passphrase: "
 msgstr "Gõ cụm từ mật khẩu: "
 
-#: lib/setup.c:1594 lib/setup.c:1670
+#: lib/setup.c:1553 lib/setup.c:1629
 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n"
 msgstr "Không thể thêm khe khoá vì mọi khe đều bị tắt và không cung cấp khoá khối tin.\n"
 
-#: lib/setup.c:1603 lib/setup.c:1676 lib/setup.c:1680
+#: lib/setup.c:1562 lib/setup.c:1635 lib/setup.c:1639
 msgid "Enter any passphrase: "
 msgstr "Gõ bất cứ cụm từ mật khẩu nào: "
 
-#: lib/setup.c:1620 lib/setup.c:1693 lib/setup.c:1697 lib/setup.c:1760
+#: lib/setup.c:1579 lib/setup.c:1652 lib/setup.c:1656 lib/setup.c:1719
 msgid "Enter new passphrase for key slot: "
 msgstr "Gõ cụm từ mật khẩu mới cho khe khoá: "
 
-#: lib/setup.c:1751 lib/setup.c:2012 lib/setup.c:2025 lib/setup.c:2152
+#: lib/setup.c:1710 lib/setup.c:1971 lib/setup.c:1984 lib/setup.c:2110
 msgid "Volume key does not match the volume.\n"
 msgstr "Khoá khối tin không tương ứng với khối tin đó.\n"
 
-#: lib/setup.c:1789
+#: lib/setup.c:1748
 #, c-format
 msgid "Key slot %d is invalid.\n"
 msgstr "Khe khoá %d không đúng.\n"
 
-#: lib/setup.c:1794
+#: lib/setup.c:1753
 #, c-format
 msgid "Key slot %d is not used.\n"
 msgstr "Khe khoá %d không được dùng.\n"
 
-#: lib/setup.c:1824 lib/setup.c:1896 lib/setup.c:1988
+#: lib/setup.c:1783 lib/setup.c:1855 lib/setup.c:1947
 #, c-format
 msgid "Device %s already exists.\n"
 msgstr "Thiết bị %s đã có.\n"
 
-#: lib/setup.c:1999
+#: lib/setup.c:1958
 msgid "Incorrect volume key specified for plain device.\n"
 msgstr "Khóa dung lượng đã chỉ định không dúng cho thiết bị thường.\n"
 
-#: lib/setup.c:2032
+#: lib/setup.c:1991
 msgid "Incorrect root hash specified for verity device.\n"
 msgstr "Mã băm gốc đã chỉ định không dúng cho thiết bị verity.\n"
 
-#: lib/setup.c:2051
+#: lib/setup.c:2009
 msgid "Device type is not properly initialised.\n"
 msgstr "Kiểu thiết bị gần như chắc chắn là chưa được thiết lập.\n"
 
-#: lib/setup.c:2080
+#: lib/setup.c:2038
 #, c-format
 msgid "Invalid device %s.\n"
 msgstr "Thiết bị không đúng %s.\n"
 
-#: lib/setup.c:2108
+#: lib/setup.c:2066
 msgid "Volume key buffer too small.\n"
 msgstr "Vùng đệm khoá khối tin quá nhỏ.\n"
 
-#: lib/setup.c:2116
+#: lib/setup.c:2074
 msgid "Cannot retrieve volume key for plain device.\n"
 msgstr "Không thể lấy khoá khối tin cho thiết bị bình thường.\n"
 
-#: lib/setup.c:2122
+#: lib/setup.c:2080
 #, c-format
 msgid "This operation is not supported for %s crypt device.\n"
-msgstr "Thao tác này không được hỗ trợ cho thiết bị mật mã %s.\n"
+msgstr "Thao tác này không được hỗ trợ cho thiết bị mã hóa %s.\n"
 
-#: lib/setup.c:2317
+#: lib/setup.c:2275
 msgid "Dump operation is not supported for this device type.\n"
 msgstr "Thao tác đổ đống (dump) không được hỗ trợ cho kiểu thiết bị này.\n"
 
-#: lib/utils.c:275
-#, c-format
-msgid "Device %s doesn't exist or access denied.\n"
-msgstr "Thiết bị %s không tồn tại hoặc không đủ quyền truy cập.\n"
-
-#: lib/utils.c:285
-#, c-format
-msgid "Cannot open device %s for %s%s access.\n"
-msgstr "Không thể mở thiết bị %s cho truy cập %s%s.\n"
-
-#: lib/utils.c:286
-msgid "exclusive "
-msgstr "dành riêng"
-
-#: lib/utils.c:287
-msgid "writable"
-msgstr "ghi được"
-
-#: lib/utils.c:287
-msgid "read-only"
-msgstr "chỉ đọc"
-
-#: lib/utils.c:294 src/cryptsetup_reencrypt.c:241
-#, c-format
-msgid "Cannot read device %s.\n"
-msgstr "Không thể đọc thiết bị %s.\n"
-
-#: lib/utils.c:391
-#, c-format
-msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
-msgstr "Không thể sử dụng thiết bị %s mà nó lại đang được sử dụng(đang được ánh xạ hoặc gắn).\n"
-
-#: lib/utils.c:395
-#, c-format
-msgid "Cannot get info about device %s.\n"
-msgstr "Không thể lấy thông tin về thiết bị %s.\n"
-
-#: lib/utils.c:401
-#, c-format
-msgid "Requested offset is beyond real size of device %s.\n"
-msgstr "Khoảng bù (offset) đã yêu cầu nằm ngoài kích thước thật của thiết bị %s.\n"
-
-#: lib/utils.c:409
-#, c-format
-msgid "Device %s has zero size.\n"
-msgstr "Thiết bị %s có kích cỡ số không.\n"
-
-#: lib/utils.c:420 lib/luks1/keymanage.c:85
-#, c-format
-msgid "Device %s is too small.\n"
-msgstr "Thiết bị %s có kích cỡ quá nhỏ.\n"
-
-#: lib/utils.c:444
-msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
-msgstr "CẢNH BÁO!!! Có thể là vùng nhớ không an toàn. Bạn có đang chạy dưới quyền siêu người dùng (root) không?\n"
-
-#: lib/utils.c:450
+#: lib/utils.c:238
 msgid "Cannot get process priority.\n"
 msgstr "Không thể lấy mức ưu tiên của tiến trình.\n"
 
-#: lib/utils.c:453 lib/utils.c:466
+#: lib/utils.c:241 lib/utils.c:254
 #, c-format
 msgid "setpriority %d failed: %s\n"
 msgstr "đặt quyền ưu tiên %d gặp lỗi: %s\n"
 
-#: lib/utils.c:464
+#: lib/utils.c:252
 msgid "Cannot unlock memory.\n"
 msgstr "Không thể mở khoá bộ nhớ.\n"
 
-#: lib/utils_crypt.c:221 lib/utils_crypt.c:234 lib/utils_crypt.c:338
-#: lib/utils_crypt.c:354
+#: lib/utils_crypt.c:225 lib/utils_crypt.c:238 lib/utils_crypt.c:385
+#: lib/utils_crypt.c:400
 msgid "Out of memory while reading passphrase.\n"
 msgstr "Tràn bộ nhớ trong khi đọc cụm từ mật khẩu.\n"
 
-#: lib/utils_crypt.c:226 lib/utils_crypt.c:241
+#: lib/utils_crypt.c:230 lib/utils_crypt.c:245
 msgid "Error reading passphrase from terminal.\n"
 msgstr "Gặp lỗi khi đọc cụm từ mật khẩu từ thiết bị cuối.\n"
 
-#: lib/utils_crypt.c:239
+#: lib/utils_crypt.c:243
 msgid "Verify passphrase: "
 msgstr "Thẩm tra cụm từ mật khẩu: "
 
-#: lib/utils_crypt.c:246
+#: lib/utils_crypt.c:250
 msgid "Passphrases do not match.\n"
 msgstr "Hai cụm từ mật khẩu không trùng nhau.\n"
 
-#: lib/utils_crypt.c:287
+#: lib/utils_crypt.c:334
 msgid "Cannot use offset with terminal input.\n"
 msgstr "Không thể sử dụng khoảng bù (offset) với đầu vào thiết bị cuối.\n"
 
-#: lib/utils_crypt.c:306
+#: lib/utils_crypt.c:353
 msgid "Failed to open key file.\n"
 msgstr "Gặp lỗi khi mở tập tin khoá.\n"
 
-#: lib/utils_crypt.c:315
+#: lib/utils_crypt.c:362
 msgid "Failed to stat key file.\n"
 msgstr "Gặp lỗi khi lấy thông tin tập tin khoá.\n"
 
-#: lib/utils_crypt.c:323 lib/utils_crypt.c:345
+#: lib/utils_crypt.c:370 lib/utils_crypt.c:391
 msgid "Cannot seek to requested keyfile offset.\n"
 msgstr "Không thể tìm (seek) tới vị trí bù (offset) tập tin khóa đã yêu cầu.\n"
 
-#: lib/utils_crypt.c:362
+#: lib/utils_crypt.c:408
 msgid "Error reading passphrase.\n"
 msgstr "Lỗi đọc cụm từ mật khẩu.\n"
 
-#: lib/utils_crypt.c:380
+#: lib/utils_crypt.c:426
 msgid "Maximum keyfile size exceeded.\n"
 msgstr "Đã vượt quá kích thước tập tin khóa tối đa.\n"
 
-#: lib/utils_crypt.c:385
+#: lib/utils_crypt.c:431
 msgid "Cannot read requested amount of data.\n"
 msgstr "Không thể đọc đống dữ liệu đã yêu cầu.\n"
 
@@ -385,20 +328,71 @@ msgstr "Thẩm tra mã băm FIPS không đạt.\n"
 msgid "Running in FIPS mode.\n"
 msgstr "Đang chạy trong chế độ FIPS.\n"
 
-#: lib/luks1/keyencryption.c:82
+#: lib/utils_device.c:48
+#, c-format
+msgid "Device %s doesn't exist or access denied.\n"
+msgstr "Thiết bị %s không tồn tại hoặc không đủ quyền truy cập.\n"
+
+#: lib/utils_device.c:58 lib/luks1/keymanage.c:298 lib/luks1/keymanage.c:527
+#: lib/luks1/keymanage.c:567 lib/verity/verity.c:80 lib/verity/verity.c:174
+#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:304
+#: lib/verity/verity_hash.c:324
+#, c-format
+msgid "Cannot open device %s.\n"
+msgstr "Không thể mở thiết bị %s.\n"
+
+#: lib/utils_device.c:333
+msgid "Cannot use a loopback device, running as non-root user.\n"
+msgstr "Không thể sử dụng thiết-bị vòng lặp (loopback), do không chạy dưới quyền siêu người dùng.\n"
+
+#: lib/utils_device.c:336
+msgid "Cannot find a free loopback device.\n"
+msgstr "Không tìm thấy thiết bị vòng ngược (loopback ) nào còn rảnh.\n"
+
+#: lib/utils_device.c:343
+msgid "Attaching loopback device failed (loop device with autoclear flag is required).\n"
+msgstr "Gặp lỗi khi gắn thiết bị vòng lặp (loopback) (thiết bị lặp với cờ autoclear là bắt buộc).\n"
+
+#: lib/utils_device.c:383
+#, c-format
+msgid "Cannot use device %s which is in use (already mapped or mounted).\n"
+msgstr "Không thể sử dụng thiết bị %s mà nó lại đang được sử dụng(đang được ánh xạ hoặc gắn).\n"
+
+#: lib/utils_device.c:387
+#, c-format
+msgid "Cannot get info about device %s.\n"
+msgstr "Không thể lấy thông tin về thiết bị %s.\n"
+
+#: lib/utils_device.c:393
+#, c-format
+msgid "Requested offset is beyond real size of device %s.\n"
+msgstr "Khoảng bù (offset) đã yêu cầu nằm ngoài kích thước thật của thiết bị %s.\n"
+
+#: lib/utils_device.c:401
+#, c-format
+msgid "Device %s has zero size.\n"
+msgstr "Thiết bị %s có kích cỡ số không.\n"
+
+#: lib/utils_device.c:412 lib/luks1/keymanage.c:89
 #, c-format
-msgid "Unable to obtain sector size for %s"
-msgstr "Không thể lấy kích cỡ rãnh ghi cho %s"
+msgid "Device %s is too small.\n"
+msgstr "Thiết bị %s có kích cỡ quá nhỏ.\n"
 
-#: lib/luks1/keyencryption.c:109
+#: lib/luks1/keyencryption.c:66 lib/luks1/keymanage.c:295
+#: lib/luks1/keymanage.c:564 lib/luks1/keymanage.c:981
+#, c-format
+msgid "Cannot write to device %s, permission denied.\n"
+msgstr "Không thể ghi thiết bị %s, không đủ thẩm quyền.\n"
+
+#: lib/luks1/keyencryption.c:91
 msgid "Key size in XTS mode must be 256 or 512 bits.\n"
 msgstr "Kích thước khóa trong chế độ XTS phải là 256 hay 512 bit.\n"
 
-#: lib/luks1/keyencryption.c:132
+#: lib/luks1/keyencryption.c:117
 msgid "Failed to obtain device mapper directory."
 msgstr "Lỗi lấy thư mục trình ánh xạ thiết bị."
 
-#: lib/luks1/keyencryption.c:148
+#: lib/luks1/keyencryption.c:133
 #, c-format
 msgid ""
 "Failed to setup dm-crypt key mapping for device %s.\n"
@@ -406,212 +400,196 @@ msgid ""
 "%s"
 msgstr ""
 "Lỗi thiết lập chức năng ánh xạ khoá dm-crypt cho thiết bị %s.\n"
-"Kiểm tra lại hạt nhân hỗ trợ mật mã %s\n"
+"Kiểm tra lại hạt nhân hỗ trợ mã hóa %s\n"
 "(xem sổ theo dõi hệ thống để tìm thêm thông tin.)\n"
 "%s"
 
-#: lib/luks1/keyencryption.c:158
+#: lib/luks1/keyencryption.c:143
 msgid "Failed to open temporary keystore device.\n"
 msgstr "Lỗi mở thiết bị lưu trữ khoá tạm thời.\n"
 
-#: lib/luks1/keyencryption.c:165
+#: lib/luks1/keyencryption.c:150
 msgid "Failed to access temporary keystore device.\n"
 msgstr "Lỗi truy cập đến thiết bị lưu trữ khoá tạm thời.\n"
 
-#: lib/luks1/keymanage.c:157
+#: lib/luks1/keymanage.c:161
 #, c-format
 msgid "Requested file %s already exist.\n"
 msgstr "Yêu cầu tập tin %s đã có.\n"
 
-#: lib/luks1/keymanage.c:177 lib/luks1/keymanage.c:408
-#: src/cryptsetup_reencrypt.c:1062
+#: lib/luks1/keymanage.c:181 lib/luks1/keymanage.c:417
+#: src/cryptsetup_reencrypt.c:1014
 #, c-format
 msgid "Device %s is not a valid LUKS device.\n"
 msgstr "Thiết bị %s không phải là một thiết bị kiểu LUKS đúng.\n"
 
-#: lib/luks1/keymanage.c:197
+#: lib/luks1/keymanage.c:202
 #, c-format
 msgid "Cannot write header backup file %s.\n"
 msgstr "Không thể ghi nhớ tập tin sao lưu phần đầu %s.\n"
 
-#: lib/luks1/keymanage.c:224
+#: lib/luks1/keymanage.c:229
 #, c-format
 msgid "Backup file %s doesn't exist.\n"
 msgstr "Tập tin sao lưu %s không tồn tại.\n"
 
-#: lib/luks1/keymanage.c:233
+#: lib/luks1/keymanage.c:238
 msgid "Backup file doesn't contain valid LUKS header.\n"
 msgstr "Tập tin sao lưu không chứa phần đầu LUKS hợp lệ.\n"
 
-#: lib/luks1/keymanage.c:246
+#: lib/luks1/keymanage.c:251
 #, c-format
 msgid "Cannot open header backup file %s.\n"
 msgstr "Không mở được tập tin sao lưu phần đầu %s.\n"
 
-#: lib/luks1/keymanage.c:252
+#: lib/luks1/keymanage.c:257
 #, c-format
 msgid "Cannot read header backup file %s.\n"
 msgstr "Không đọc được tập tin sao lưu phần đầu %s.\n"
 
-#: lib/luks1/keymanage.c:263
+#: lib/luks1/keymanage.c:268
 msgid "Data offset or key size differs on device and backup, restore failed.\n"
 msgstr "Khoảng bù dữ liệu hoặc kích cỡ khoá vẫn khác nhau trên thiết bị và bản sao lưu thì chức năng phục hồi bị lỗi.\n"
 
-#: lib/luks1/keymanage.c:271
+#: lib/luks1/keymanage.c:276
 #, c-format
 msgid "Device %s %s%s"
 msgstr "Thiết bị %s %s%s"
 
-#: lib/luks1/keymanage.c:272
+#: lib/luks1/keymanage.c:277
 msgid "does not contain LUKS header. Replacing header can destroy data on that device."
 msgstr "không chứa phần đầu LUKS. Thay thế phần đầu thì cũng có thể hủy dữ liệu trên thiết bị đó."
 
-#: lib/luks1/keymanage.c:273
+#: lib/luks1/keymanage.c:278
 msgid "already contains LUKS header. Replacing header will destroy existing keyslots."
 msgstr "đã chứa phần đầu LUKS. Thay thế phần đầu thì cũng hủy các khe khoá đã có."
 
-#: lib/luks1/keymanage.c:274
+#: lib/luks1/keymanage.c:279
 msgid ""
 "\n"
 "WARNING: real device header has different UUID than backup!"
 msgstr ""
 "\n"
-"CẢNH BÁO: phần đầu thiết bị thật có mã số UUID khác với bản sao lưu !"
-
-#: lib/luks1/keymanage.c:289 lib/luks1/keymanage.c:513
-#: lib/luks1/keymanage.c:549 lib/verity/verity.c:79 lib/verity/verity.c:172
-#: lib/verity/verity_hash.c:293 lib/verity/verity_hash.c:302
-#: lib/verity/verity_hash.c:321
-#, c-format
-msgid "Cannot open device %s.\n"
-msgstr "Không thể mở thiết bị %s.\n"
+"CẢNH BÁO: phần đầu thiết bị thật có mã số UUID khác với bản sao lưu!"
 
-#: lib/luks1/keymanage.c:319
+#: lib/luks1/keymanage.c:328
 msgid "Non standard key size, manual repair required.\n"
 msgstr "Kích thước khóa không tiêu chuẩn, yêu cầu sửa chữa bằng tay.\n"
 
-#: lib/luks1/keymanage.c:324
+#: lib/luks1/keymanage.c:333
 msgid "Non standard keyslots alignment, manual repair required.\n"
 msgstr "Không thể đồng chỉnh các khe khóa (keyslot) tiêu chuẩn, yêu cầu sửa chữa bằng tay.\n"
 
-#: lib/luks1/keymanage.c:330
+#: lib/luks1/keymanage.c:339
 msgid "Repairing keyslots.\n"
 msgstr "Đang chuẩn bị keyslots.\n"
 
-#: lib/luks1/keymanage.c:341
+#: lib/luks1/keymanage.c:350
 msgid "Repair failed."
 msgstr "Sửa chữa gặp lỗi."
 
-#: lib/luks1/keymanage.c:353
+#: lib/luks1/keymanage.c:362
 #, c-format
 msgid "Keyslot %i: offset repaired (%u -> %u).\n"
 msgstr "Khe-khoá (keyslot) %i: khoảng bù (offset) được sửa chữa (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:361
+#: lib/luks1/keymanage.c:370
 #, c-format
 msgid "Keyslot %i: stripes repaired (%u -> %u).\n"
 msgstr "Khe-khoá (keyslot) %i: stripes được sửa chữa (%u -> %u).\n"
 
-#: lib/luks1/keymanage.c:370
+#: lib/luks1/keymanage.c:379
 #, c-format
 msgid "Keyslot %i: bogus partition signature.\n"
 msgstr "Khe-khoá (keyslot) %i: chữ ký phân vùng không có thật.\n"
 
-#: lib/luks1/keymanage.c:375
+#: lib/luks1/keymanage.c:384
 #, c-format
 msgid "Keyslot %i: salt wiped.\n"
 msgstr "Khe-khoá (keyslot) %i: salt bị tẩy xóa.\n"
 
-#: lib/luks1/keymanage.c:386
+#: lib/luks1/keymanage.c:395
 msgid "Writing LUKS header to disk.\n"
 msgstr "Đang ghi phần đầu của LUKS lên đĩa.\n"
 
-#: lib/luks1/keymanage.c:411
+#: lib/luks1/keymanage.c:420
 #, c-format
 msgid "Unsupported LUKS version %d.\n"
 msgstr "Phiên bản LUKS không được hỗ trợ %d.\n"
 
-#: lib/luks1/keymanage.c:417 lib/luks1/keymanage.c:621
+#: lib/luks1/keymanage.c:426 lib/luks1/keymanage.c:639
 #, c-format
 msgid "Requested LUKS hash %s is not supported.\n"
 msgstr "Không hỗ trợ chuỗi duy nhất LUKS %s được yêu cầu.\n"
 
-#: lib/luks1/keymanage.c:432
+#: lib/luks1/keymanage.c:441
 #, c-format
 msgid "LUKS keyslot %u is invalid.\n"
 msgstr "khe-khoá LUKS %u là không hợp lệ.\n"
 
-#: lib/luks1/keymanage.c:446 src/cryptsetup.c:537
+#: lib/luks1/keymanage.c:455 src/cryptsetup.c:388
 msgid "No known problems detected for LUKS header.\n"
 msgstr "Không phát hiện thấy vấn đề với phần đầu LUKS.\n"
 
-#: lib/luks1/keymanage.c:480
+#: lib/luks1/keymanage.c:488
 #, c-format
 msgid "Cannot open file %s.\n"
 msgstr "Không thể mở tập tin %s.\n"
 
-#: lib/luks1/keymanage.c:570
+#: lib/luks1/keymanage.c:588
 #, c-format
 msgid "Error during update of LUKS header on device %s.\n"
 msgstr "Gặp lỗi trong khi cập nhật phần đầu LUKS trên thiết bị %s.\n"
 
-#: lib/luks1/keymanage.c:577
+#: lib/luks1/keymanage.c:595
 #, c-format
 msgid "Error re-reading LUKS header after update on device %s.\n"
 msgstr "Gặp lỗi trong khi đọc lại phần đầu LUKS sau khi cập nhật trên thiết bị %s.\n"
 
-#: lib/luks1/keymanage.c:589
+#: lib/luks1/keymanage.c:608
 #, c-format
 msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n"
-msgstr "Gặp các tuỳ chọn PBKDF2 không tương thích (dùng thuật toán chuỗi duy nhất %s).\n"
+msgstr "Gặp các tùy chọn PBKDF2 không tương thích (dùng thuật toán chuỗi duy nhất %s).\n"
 
-#: lib/luks1/keymanage.c:626 lib/luks1/keymanage.c:708
+#: lib/luks1/keymanage.c:644 lib/luks1/keymanage.c:726
 msgid "Wrong LUKS UUID format provided.\n"
 msgstr "Đưa ra định dạng mã số UUID LUKS không đúng.\n"
 
-#: lib/luks1/keymanage.c:651
+#: lib/luks1/keymanage.c:669
 msgid "Cannot create LUKS header: reading random salt failed.\n"
 msgstr "Không thể tạo phần đầu LUKS: lỗi đọc salt ngẫu nhiên.\n"
 
-#: lib/luks1/keymanage.c:668
+#: lib/luks1/keymanage.c:686
 #, c-format
 msgid "Cannot create LUKS header: header digest failed (using hash %s).\n"
 msgstr "Không thể tạo phần đầu LUKS: lỗi tạo bản tóm tắt (dùng chuỗi duy nhất %s).\n"
 
-#: lib/luks1/keymanage.c:733
+#: lib/luks1/keymanage.c:751
 #, c-format
 msgid "Key slot %d active, purge first.\n"
 msgstr "Khe khoá %d vẫn hoạt động: cần tẩy trước.\n"
 
-#: lib/luks1/keymanage.c:738
+#: lib/luks1/keymanage.c:757
 #, c-format
 msgid "Key slot %d material includes too few stripes. Header manipulation?\n"
 msgstr "Nguyên liệu khe khoá %d gồm có quá ít sọc. Có nên thao tác phần đầu không?\n"
 
-#: lib/luks1/keymanage.c:805
-msgid "Failed to write to key storage.\n"
-msgstr "Lỗi ghi khoá vào kho lưu khoá.\n"
-
-#: lib/luks1/keymanage.c:890
-msgid "Failed to read from key storage.\n"
-msgstr "Lỗi đọc từ kho lưu khoá.\n"
-
-#: lib/luks1/keymanage.c:900
+#: lib/luks1/keymanage.c:914
 #, c-format
 msgid "Key slot %d unlocked.\n"
 msgstr "Khe khoá %d được mở khoá.\n"
 
-#: lib/luks1/keymanage.c:936 src/cryptsetup.c:736 src/cryptsetup.c:920
-#: src/cryptsetup_reencrypt.c:966 src/cryptsetup_reencrypt.c:1000
+#: lib/luks1/keymanage.c:949 src/cryptsetup.c:587 src/cryptsetup.c:771
+#: src/cryptsetup_reencrypt.c:918 src/cryptsetup_reencrypt.c:952
 msgid "No key available with this passphrase.\n"
 msgstr "Không có khoá sẵn sàng dùng với cụm từ mật khẩu này.\n"
 
-#: lib/luks1/keymanage.c:954
+#: lib/luks1/keymanage.c:967
 #, c-format
 msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n"
 msgstr "Khe khoá %d không đúng: hãy chọn khe khoá trong phạm vi 0 đến %d.\n"
 
-#: lib/luks1/keymanage.c:968
+#: lib/luks1/keymanage.c:985
 #, c-format
 msgid "Cannot wipe device %s.\n"
 msgstr "Không thể xoá thiết bị %s.\n"
@@ -626,44 +604,44 @@ msgstr "Hãy sử dụng gpg --decrypt <KEYFILE> | cryptsetup --keyfile=- ...\n"
 
 #: lib/loopaes/loopaes.c:176
 msgid "Incompatible loop-AES keyfile detected.\n"
-msgstr "Tập tin khoá (keyfile)  loop-AES không tương thích được tìm thấy.\n"
+msgstr "Tập tin khoá (keyfile) loop-AES không tương thích được tìm thấy.\n"
 
-#: lib/loopaes/loopaes.c:231
+#: lib/loopaes/loopaes.c:230
 msgid "Kernel doesn't support loop-AES compatible mapping.\n"
 msgstr "Nhân không hỗ trợ ánh xạ tương thích loop-AES.\n"
 
-#: lib/verity/verity.c:68 lib/verity/verity.c:166
+#: lib/verity/verity.c:69 lib/verity/verity.c:168
 msgid "Verity device doesn't use on-disk header.\n"
 msgstr "Thiết bị verity không sử dụng phần đầu on-disk.\n"
 
-#: lib/verity/verity.c:91
+#: lib/verity/verity.c:92
 #, c-format
 msgid "Device %s is not a valid VERITY device.\n"
 msgstr "Thiết bị %s không phải là thiết bị VERITY thích hợp.\n"
 
-#: lib/verity/verity.c:97
+#: lib/verity/verity.c:98
 #, c-format
 msgid "Unsupported VERITY version %d.\n"
 msgstr "Không hỗ trợ phiên bản VERITY %d.\n"
 
-#: lib/verity/verity.c:127
+#: lib/verity/verity.c:128
 msgid "VERITY header corrupted.\n"
 msgstr "phần đầu VERITY sai hỏng.\n"
 
-#: lib/verity/verity.c:161
+#: lib/verity/verity.c:163
 msgid "Wrong VERITY UUID format provided.\n"
 msgstr "Đưa ra định dạng mã số UUID VERITY không đúng.\n"
 
-#: lib/verity/verity.c:189
+#: lib/verity/verity.c:191
 #, c-format
 msgid "Error during update of verity header on device %s.\n"
 msgstr "Gặp lỗi trong khi cập nhật phần đầu verity trên thiết bị %s.\n"
 
-#: lib/verity/verity.c:265
+#: lib/verity/verity.c:270
 msgid "Kernel doesn't support dm-verity mapping.\n"
 msgstr "Nhân không hỗ trợ ánh xạ dm-verity.\n"
 
-#: lib/verity/verity.c:276
+#: lib/verity/verity.c:281
 msgid "Verity device detected corruption after activation.\n"
 msgstr "Thiết bị verity đã được phát hiện sai hỏng sau khi hoạt hóa.\n"
 
@@ -672,7 +650,7 @@ msgstr "Thiết bị verity đã được phát hiện sai hỏng sau khi hoạt
 msgid "Spare area is not zeroed at position %<PRIu64>.\n"
 msgstr "Vùng để dành không được điền đầy bằng số không tại vị trí %<PRIu64>.\n"
 
-#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:247
+#: lib/verity/verity_hash.c:120 lib/verity/verity_hash.c:248
 #: lib/verity/verity_hash.c:278 lib/verity/verity_hash.c:285
 msgid "Device offset overflow.\n"
 msgstr "Khoảng bù (offset) thiết bị bị tràn.\n"
@@ -682,27 +660,27 @@ msgstr "Khoảng bù (offset) thiết bị bị tràn.\n"
 msgid "Verification failed at position %<PRIu64>.\n"
 msgstr "Thẩm tra gặp lỗi tại vị trí %<PRIu64>.\n"
 
-#: lib/verity/verity_hash.c:233
+#: lib/verity/verity_hash.c:234
 msgid "Invalid size parameters for verity device.\n"
 msgstr "Các tham số kích thước cho thiết bị verity không hợp lệ.\n"
 
-#: lib/verity/verity_hash.c:265
+#: lib/verity/verity_hash.c:266
 msgid "Too many tree levels for verity volume.\n"
 msgstr "Có quá nhiều mức cây cho mỗi vùng verity.\n"
 
-#: lib/verity/verity_hash.c:351
+#: lib/verity/verity_hash.c:355
 msgid "Verification of data area failed.\n"
 msgstr "Việc thẩm tra vùng dữ liệu gặp lỗi.\n"
 
-#: lib/verity/verity_hash.c:356
+#: lib/verity/verity_hash.c:360
 msgid "Verification of root hash failed.\n"
 msgstr "Việc thẩm tra mã băm gốc gặp lỗi.\n"
 
-#: lib/verity/verity_hash.c:362
+#: lib/verity/verity_hash.c:366
 msgid "Input/output error while creating hash area.\n"
 msgstr "Lỗi Vào/Ra trong khi đang tạo vùng băm.\n"
 
-#: lib/verity/verity_hash.c:364
+#: lib/verity/verity_hash.c:368
 msgid "Creation of hash area failed.\n"
 msgstr "Việc tạo vùng dữ liệu băm gặp lỗi.\n"
 
@@ -711,215 +689,206 @@ msgstr "Việc tạo vùng dữ liệu băm gặp lỗi.\n"
 msgid "WARNING: Kernel cannot activate device if data block size exceeds page size (%u).\n"
 msgstr "CẢNH BÁO: Nhân (kernel) không thể kích hoạt thiết bị nếu kích thước khối dữ liệu vượt quá kích cỡ trang (%u).\n"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "<name> <device>"
 msgstr "<tên> <thiết_bị>"
 
-#: src/cryptsetup.c:105
+#: src/cryptsetup.c:88
 msgid "create device"
 msgstr "tạo thiết bị"
 
-#: src/cryptsetup.c:106 src/cryptsetup.c:107 src/cryptsetup.c:108
-#: src/cryptsetup.c:118 src/cryptsetup.c:125 src/veritysetup.c:385
-#: src/veritysetup.c:386
+#: src/cryptsetup.c:89 src/cryptsetup.c:90 src/cryptsetup.c:91
+#: src/cryptsetup.c:101 src/cryptsetup.c:108 src/veritysetup.c:311
+#: src/veritysetup.c:312
 msgid "<name>"
 msgstr "<tên>"
 
-#: src/cryptsetup.c:106
+#: src/cryptsetup.c:89
 msgid "remove device"
 msgstr "gỡ bỏ thiết bị"
 
-#: src/cryptsetup.c:107
+#: src/cryptsetup.c:90
 msgid "resize active device"
 msgstr "thay đổi kích cỡ của thiết bị hoạt động"
 
-#: src/cryptsetup.c:108
+#: src/cryptsetup.c:91
 msgid "show device status"
 msgstr "hiển thị trạng thái về thiết bị"
 
-#: src/cryptsetup.c:109 src/cryptsetup.c:116 src/cryptsetup.c:117
-#: src/cryptsetup.c:119 src/cryptsetup.c:120 src/cryptsetup.c:121
-#: src/cryptsetup.c:122 src/cryptsetup.c:123
+#: src/cryptsetup.c:92 src/cryptsetup.c:99 src/cryptsetup.c:100
+#: src/cryptsetup.c:102 src/cryptsetup.c:103 src/cryptsetup.c:104
+#: src/cryptsetup.c:105 src/cryptsetup.c:106
 msgid "<device>"
 msgstr "<thiết_bị>"
 
-#: src/cryptsetup.c:109
+#: src/cryptsetup.c:92
 msgid "try to repair on-disk metadata"
 msgstr "thử sửa chữa siêu dữ liệu (metadata) on-disk"
 
-#: src/cryptsetup.c:110 src/cryptsetup.c:112
+#: src/cryptsetup.c:93 src/cryptsetup.c:95
 msgid "<device> [<new key file>]"
 msgstr "<thiết_bị> [<tập_tin_khoá_mới>]"
 
-#: src/cryptsetup.c:110
+#: src/cryptsetup.c:93
 msgid "formats a LUKS device"
 msgstr "định dạng một thiết bị kiểu LUKS"
 
-#: src/cryptsetup.c:111 src/cryptsetup.c:124
+#: src/cryptsetup.c:94 src/cryptsetup.c:107
 msgid "<device> <name> "
 msgstr "<thiết_bị> <tên> "
 
-#: src/cryptsetup.c:111
+#: src/cryptsetup.c:94
 msgid "open LUKS device as mapping <name>"
 msgstr "mở thiết bị LUKS như là bản ánh xạ <tên>"
 
-#: src/cryptsetup.c:112
+#: src/cryptsetup.c:95
 msgid "add key to LUKS device"
 msgstr "thêm khoá vào thiết bị LUKS"
 
-#: src/cryptsetup.c:113 src/cryptsetup.c:114
+#: src/cryptsetup.c:96 src/cryptsetup.c:97
 msgid "<device> [<key file>]"
 msgstr "<thiết_bị> [<tập_tin_khoá>]"
 
-#: src/cryptsetup.c:113
+#: src/cryptsetup.c:96
 msgid "removes supplied key or key file from LUKS device"
 msgstr "gỡ bỏ khỏi thiết bị LUKS khoá hoặc tập tin khoá đưa ra"
 
-#: src/cryptsetup.c:114
+#: src/cryptsetup.c:97
 msgid "changes supplied key or key file of LUKS device"
 msgstr "thay đổi khóa hay tập tin khóa đã áp dụng của thiết bị LUKS"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "<device> <key slot>"
 msgstr "<thiết_bị> <khe_khoá>"
 
-#: src/cryptsetup.c:115
+#: src/cryptsetup.c:98
 msgid "wipes key with number <key slot> from LUKS device"
 msgstr "xoá khỏi thiết bị LUKS khoá có số <khe_khoá>"
 
-#: src/cryptsetup.c:116
+#: src/cryptsetup.c:99
 msgid "print UUID of LUKS device"
 msgstr "in ra mã số UUID của thiết bị LUKS"
 
-#: src/cryptsetup.c:117
+#: src/cryptsetup.c:100
 msgid "tests <device> for LUKS partition header"
 msgstr "thử <thiết_bị> có phần đầu phân vùng LUKS không"
 
-#: src/cryptsetup.c:118
+#: src/cryptsetup.c:101
 msgid "remove LUKS mapping"
 msgstr "gỡ bỏ sự ánh xạ LUKS"
 
-#: src/cryptsetup.c:119
+#: src/cryptsetup.c:102
 msgid "dump LUKS partition information"
 msgstr "đổ thông tin về phân vùng LUKS"
 
-#: src/cryptsetup.c:120
+#: src/cryptsetup.c:103
 msgid "Suspend LUKS device and wipe key (all IOs are frozen)."
 msgstr "Ngưng thiết bị LUKS và xoá khoá (thì mọi việc V/R đều đông cứng)."
 
-#: src/cryptsetup.c:121
+#: src/cryptsetup.c:104
 msgid "Resume suspended LUKS device."
 msgstr "Tiếp tục lại sử dụng thiết bị LUKS bị ngưng."
 
-#: src/cryptsetup.c:122
+#: src/cryptsetup.c:105
 msgid "Backup LUKS device header and keyslots"
 msgstr "Sao lưu phần đầu và các khe khoá của thiết bị LUKS"
 
-#: src/cryptsetup.c:123
+#: src/cryptsetup.c:106
 msgid "Restore LUKS device header and keyslots"
 msgstr "Phục hồi phần đầu và các khe khoá của thiết bị LUKS"
 
-#: src/cryptsetup.c:124
+#: src/cryptsetup.c:107
 msgid "open loop-AES device as mapping <name>"
 msgstr "mở thiết bị loop-AES như là ánh xạ <tên>"
 
-#: src/cryptsetup.c:125
+#: src/cryptsetup.c:108
 msgid "remove loop-AES mapping"
-msgstr "gỡ bỏ ánh xạ  loop-AES"
+msgstr "gỡ bỏ ánh xạ loop-AES"
 
-#: src/cryptsetup.c:218
+#: src/cryptsetup.c:123
 msgid "Can't do passphrase verification on non-tty inputs.\n"
 msgstr "Không thể thẩm tra cụm từ mật khẩu trên đầu vào khác TTY.\n"
 
-#: src/cryptsetup.c:233 src/veritysetup.c:432
-msgid "Command successful.\n"
-msgstr "Câu lệnh đã chạy thành công.\n"
-
-#: src/cryptsetup.c:247 src/veritysetup.c:446
-#, c-format
-msgid "Command failed with code %i"
-msgstr "Câu lệnh đã thất bại với mã %i"
-
-#: src/cryptsetup.c:375
+#: src/cryptsetup.c:226
 msgid "Option --key-file is required.\n"
-msgstr "Tuỳ chọn --key-file là cần thiết.\n"
+msgstr "Cần tùy chọn `--key-file'.\n"
 
-#: src/cryptsetup.c:541
+#: src/cryptsetup.c:392
 msgid "Really try to repair LUKS device header?"
 msgstr "Bạn có thực sự muốn thử sửa chữa phần đầu thiết bị LUKS không?"
 
-#: src/cryptsetup.c:566
+#: src/cryptsetup.c:417
 #, c-format
 msgid "This will overwrite data on %s irrevocably."
 msgstr "Hành động này sẽ ghi đè lên dữ liệu trên thiết bị %s một cách không phục hồi được."
 
-#: src/cryptsetup.c:568
+#: src/cryptsetup.c:419
 msgid "memory allocation error in action_luksFormat"
-msgstr "gặp lỗi phân cấp vùng nhớ trong \"action_luksFormat\""
+msgstr "gặp lỗi phân cấp vùng nhớ trong`action_luksFormat'"
 
-#: src/cryptsetup.c:580 src/cryptsetup_reencrypt.c:576
-#: src/cryptsetup_reencrypt.c:611
+#: src/cryptsetup.c:431 src/cryptsetup_reencrypt.c:522
+#: src/cryptsetup_reencrypt.c:557
 msgid "No known cipher specification pattern detected.\n"
-msgstr "Không phát hiện mẫu chỉ thị mật mã đã biết.\n"
+msgstr "Không phát hiện mẫu đặc tả mã hóa đã biết.\n"
 
-#: src/cryptsetup.c:586
+#: src/cryptsetup.c:437
 #, c-format
 msgid "Cannot use %s as on-disk header.\n"
 msgstr "Không thể sử dụng %s như là phần đầu on-disk.\n"
 
-#: src/cryptsetup.c:601 src/cryptsetup.c:1034
+#: src/cryptsetup.c:452 src/cryptsetup.c:885
 msgid "Enter LUKS passphrase: "
 msgstr "Gõ cụm từ mật khẩu LUKS: "
 
-#: src/cryptsetup.c:658
+#: src/cryptsetup.c:509
 msgid "Reduced data offset is allowed only for detached LUKS header.\n"
 msgstr "Giảm khoảng bù (offset) dữ liệu chỉ cho phép khi phần đầu LUKS được tách rời.\n"
 
-#: src/cryptsetup.c:759 src/cryptsetup.c:814
+#: src/cryptsetup.c:610 src/cryptsetup.c:665
 #, c-format
 msgid "Key slot %d selected for deletion.\n"
 msgstr "Khe khoá %d đã được chọn để xoá.\n"
 
-#: src/cryptsetup.c:762
+#: src/cryptsetup.c:613
 #, c-format
 msgid "Key %d not active. Can't wipe.\n"
 msgstr "Khoá %d không hoạt động thì không xoá được.\n"
 
-#: src/cryptsetup.c:770 src/cryptsetup.c:817
+#: src/cryptsetup.c:621 src/cryptsetup.c:668
 msgid "This is the last keyslot. Device will become unusable after purging this key."
 msgstr "Đây là khe khoá cuối cùng. Sau khi tẩy khoá này thì thiết bị không dùng được."
 
-#: src/cryptsetup.c:771
+#: src/cryptsetup.c:622
 msgid "Enter any remaining LUKS passphrase: "
-msgstr "Gõ cụm từ mật khẩu LUKS nào còn lại:"
+msgstr "Gõ cụm từ mật khẩu LUKS nào còn lại: "
 
-#: src/cryptsetup.c:799
+#: src/cryptsetup.c:650
 msgid "Enter LUKS passphrase to be deleted: "
-msgstr "Gõ cụm từ mật khẩu LUKS cần xoá:"
+msgstr "Gõ cụm từ mật khẩu LUKS cần xoá: "
 
-#: src/cryptsetup.c:902
+#: src/cryptsetup.c:753
 msgid "Enter LUKS passphrase to be changed: "
-msgstr "Gõ cụm từ mật khẩu LUKS được thay đổi:"
+msgstr "Gõ cụm từ mật khẩu LUKS được thay đổi: "
 
-#: src/cryptsetup.c:939 src/cryptsetup_reencrypt.c:1018
+#: src/cryptsetup.c:790 src/cryptsetup_reencrypt.c:970
 msgid "Enter new LUKS passphrase: "
 msgstr "Gõ cụm từ mật khẩu LUKS:"
 
-#: src/cryptsetup.c:953
+#: src/cryptsetup.c:804
 #, c-format
 msgid "Key slot %d changed.\n"
 msgstr "Khe khoá %d đã thay đổi.\n"
 
-#: src/cryptsetup.c:959
+#: src/cryptsetup.c:810
 #, c-format
 msgid "Replaced with key slot %d.\n"
 msgstr "Đã thay thế với khe khoá %d.\n"
 
-#: src/cryptsetup.c:964
+#: src/cryptsetup.c:815
 msgid "Failed to swap new key slot.\n"
 msgstr "Gặp lỗi khi hoán đổi khe khoá mới.\n"
 
-#: src/cryptsetup.c:1023
+#: src/cryptsetup.c:874
 msgid ""
 "LUKS header dump with volume key is sensitive information\n"
 "which allows access to encrypted partition without passphrase.\n"
@@ -929,19 +898,19 @@ msgstr ""
 "cái mà cho phép truy cập phân vùng được mã hóa mà không cần mật khẩu.\n"
 "Việc đổ đống này nên luôn được lưu trữ mã hóa tại một nơi an toàn."
 
-#: src/cryptsetup.c:1128 src/cryptsetup.c:1149
+#: src/cryptsetup.c:979 src/cryptsetup.c:1000
 msgid "Option --header-backup-file is required.\n"
-msgstr "Tuỳ chọn \"--header-backup-file\" cũng cần thiết.\n"
+msgstr "Cần tùy chọn`--header-backup-file'.\n"
 
-#: src/cryptsetup.c:1187 src/veritysetup.c:402
+#: src/cryptsetup.c:1027 src/veritysetup.c:328
 msgid ""
 "\n"
 "<action> is one of:\n"
 msgstr ""
 "\n"
-"<hành_vi> là một của những điều dưới đây:\n"
+"<hành_động> là một trong:\n"
 
-#: src/cryptsetup.c:1193
+#: src/cryptsetup.c:1033
 #, c-format
 msgid ""
 "\n"
@@ -952,11 +921,11 @@ msgid ""
 msgstr ""
 "\n"
 "<tên> là thiết bị cần tạo dưới %s\n"
-"<thiết_bị> là thiết bị đã mật mã\n"
+"<thiết_bị> là thiết bị đã mã hóa\n"
 "<khe_khoá> là số thứ tự khe khoá LUKS cần sửa đổi\n"
-"<tập_tin_khoá> là tập tin khoá tuỳ chọn cho khoá mới trong hành động luksAddKey\n"
+"<tập_tin_khoá> là tập tin khoá tùy chọn cho khoá mới trong hành động luksAddKey\n"
 
-#: src/cryptsetup.c:1200
+#: src/cryptsetup.c:1040
 #, c-format
 msgid ""
 "\n"
@@ -967,7 +936,7 @@ msgstr ""
 "Các tham số khóa tập tin mặc định đã được dịch sẵn:\n"
 "\tKích thước tập tin khóa tối đa: %dkB, Độ dài mật khẩu trao đổi tối đa %d (ký tự)\n"
 
-#: src/cryptsetup.c:1205
+#: src/cryptsetup.c:1045
 #, c-format
 msgid ""
 "\n"
@@ -977,302 +946,308 @@ msgid ""
 "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n"
 msgstr ""
 "\n"
-"Các tham số mặc định về mật mã thiết bị biên dịch sẵn:\n"
+"Các tham số mặc định về mã hóa thiết bị biên dịch sẵn:\n"
 "\tloop-AES: %s, Khóa %d bit\n"
 "\tbình thường: %s, Khoá: %d bit, Mã băm mật khẩu: %s\n"
 "\tLUKS1: %s, Khoá: %d bit, Mã băm phần đầu LUKS: %s, RNG: %s\n"
 
-#: src/cryptsetup.c:1273 src/veritysetup.c:486 src/cryptsetup_reencrypt.c:1207
+#: src/cryptsetup.c:1085 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1135
 msgid "Show this help message"
 msgstr "Hiển thị trợ giúp này"
 
-#: src/cryptsetup.c:1274 src/veritysetup.c:487 src/cryptsetup_reencrypt.c:1208
+#: src/cryptsetup.c:1086 src/veritysetup.c:369 src/cryptsetup_reencrypt.c:1136
 msgid "Display brief usage"
-msgstr " Hiển thị thông điệp ngắn về cách sử dụng"
+msgstr "Hiển thị thông tin ngắn về cách sử dụng"
 
-#: src/cryptsetup.c:1278 src/veritysetup.c:491 src/cryptsetup_reencrypt.c:1212
+#: src/cryptsetup.c:1090 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1140
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: src/cryptsetup.c:1279 src/veritysetup.c:492 src/cryptsetup_reencrypt.c:1213
+#: src/cryptsetup.c:1091 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1141
 msgid "Print package version"
 msgstr "In ra phiên bản gói"
 
-#: src/cryptsetup.c:1280 src/veritysetup.c:493 src/cryptsetup_reencrypt.c:1214
+#: src/cryptsetup.c:1092 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1142
 msgid "Shows more detailed error messages"
 msgstr "Hiển thị các thông điệp lỗi chi tiết hơn"
 
-#: src/cryptsetup.c:1281 src/veritysetup.c:494 src/cryptsetup_reencrypt.c:1215
+#: src/cryptsetup.c:1093 src/veritysetup.c:376 src/cryptsetup_reencrypt.c:1143
 msgid "Show debug messages"
 msgstr "Hiển thị thông điệp gỡ lỗi"
 
-#: src/cryptsetup.c:1282 src/cryptsetup_reencrypt.c:1217
+#: src/cryptsetup.c:1094 src/cryptsetup_reencrypt.c:1145
 msgid "The cipher used to encrypt the disk (see /proc/crypto)"
-msgstr "Mật mã dùng để bảo vệ đĩa (xem \"/proc/crypto\")"
+msgstr "Mật mã dùng để bảo vệ đĩa (xem`/proc/crypto')"
 
-#: src/cryptsetup.c:1283 src/cryptsetup_reencrypt.c:1219
+#: src/cryptsetup.c:1095 src/cryptsetup_reencrypt.c:1147
 msgid "The hash used to create the encryption key from the passphrase"
-msgstr "Chuỗi duy nhất dùng để tạo khoá mật mã từ cụm từ mật khẩu"
+msgstr "Chuỗi duy nhất dùng để tạo khoá mã hóa từ cụm từ mật khẩu"
 
-#: src/cryptsetup.c:1284
+#: src/cryptsetup.c:1096
 msgid "Verifies the passphrase by asking for it twice"
 msgstr "Thẩm tra cụm từ mật khẩu bằng cách yêu cầu nó hai lần"
 
-#: src/cryptsetup.c:1285 src/cryptsetup_reencrypt.c:1220
+#: src/cryptsetup.c:1097 src/cryptsetup_reencrypt.c:1148
 msgid "Read the key from a file."
 msgstr "Đọc khoá từ một tập tin."
 
-#: src/cryptsetup.c:1286
+#: src/cryptsetup.c:1098
 msgid "Read the volume (master) key from file."
 msgstr "Đọc khoá khối tin (chủ) từ tập tin."
 
-#: src/cryptsetup.c:1287
+#: src/cryptsetup.c:1099
 msgid "Dump volume (master) key instead of keyslots info."
 msgstr "Dump (đổ thành đống) khóa dung lượng (master) thay vì thông tin khe-khóa."
 
-#: src/cryptsetup.c:1288 src/cryptsetup_reencrypt.c:1218
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "The size of the encryption key"
-msgstr "Kích cỡ của khoá mật mã"
+msgstr "Kích cỡ của khoá mã hóa"
 
-#: src/cryptsetup.c:1288 src/cryptsetup_reencrypt.c:1218
+#: src/cryptsetup.c:1100 src/cryptsetup_reencrypt.c:1146
 msgid "BITS"
 msgstr "BIT"
 
-#: src/cryptsetup.c:1289 src/cryptsetup_reencrypt.c:1231
+#: src/cryptsetup.c:1101 src/cryptsetup_reencrypt.c:1159
 msgid "Limits the read from keyfile"
 msgstr "Giới hạn việc đọc từ tệp-tin-khoá"
 
-#: src/cryptsetup.c:1289 src/cryptsetup.c:1290 src/cryptsetup.c:1291
-#: src/cryptsetup.c:1292 src/veritysetup.c:497 src/veritysetup.c:498
-#: src/veritysetup.c:500 src/cryptsetup_reencrypt.c:1230
-#: src/cryptsetup_reencrypt.c:1231
+#: src/cryptsetup.c:1101 src/cryptsetup.c:1102 src/cryptsetup.c:1103
+#: src/cryptsetup.c:1104 src/veritysetup.c:379 src/veritysetup.c:380
+#: src/veritysetup.c:382 src/cryptsetup_reencrypt.c:1158
+#: src/cryptsetup_reencrypt.c:1159 src/cryptsetup_reencrypt.c:1160
+#: src/cryptsetup_reencrypt.c:1161
 msgid "bytes"
 msgstr "byte"
 
-#: src/cryptsetup.c:1290 src/cryptsetup_reencrypt.c:1230
+#: src/cryptsetup.c:1102 src/cryptsetup_reencrypt.c:1158
 msgid "Number of bytes to skip in keyfile"
 msgstr "Số lượng byte nhảy qua trong tập tin khoá"
 
-#: src/cryptsetup.c:1291
+#: src/cryptsetup.c:1103
 msgid "Limits the read from newly added keyfile"
 msgstr "Giới hạn đọc từ tập tin khóa mới thêm vào"
 
-#: src/cryptsetup.c:1292
+#: src/cryptsetup.c:1104
 msgid "Number of bytes to skip in newly added keyfile"
 msgstr "Số lượng byte để nhảy qua trong tập tin khóa mới thêm"
 
-#: src/cryptsetup.c:1293
+#: src/cryptsetup.c:1105
 msgid "Slot number for new key (default is first free)"
 msgstr "Số thứ tự khe cho khoá mới (mặc định là khe trống thứ nhất)"
 
-#: src/cryptsetup.c:1294
+#: src/cryptsetup.c:1106
 msgid "The size of the device"
 msgstr "Kích cỡ của thiết bị"
 
-#: src/cryptsetup.c:1294 src/cryptsetup.c:1295 src/cryptsetup.c:1296
-#: src/cryptsetup.c:1302 src/cryptsetup_reencrypt.c:1232
+#: src/cryptsetup.c:1106 src/cryptsetup.c:1107 src/cryptsetup.c:1108
+#: src/cryptsetup.c:1114
 msgid "SECTORS"
 msgstr "RÃNH GHI"
 
-#: src/cryptsetup.c:1295
+#: src/cryptsetup.c:1107
 msgid "The start offset in the backend device"
 msgstr "Khoảng bù đầu tiên trong thiết bị hậu phương"
 
-#: src/cryptsetup.c:1296
+#: src/cryptsetup.c:1108
 msgid "How many sectors of the encrypted data to skip at the beginning"
-msgstr "Bao nhiêu rãnh ghi dữ liệu mật mã cần bỏ qua ở đầu"
+msgstr "Bao nhiêu rãnh ghi dữ liệu mã hóa cần bỏ qua ở đầu"
 
-#: src/cryptsetup.c:1297
+#: src/cryptsetup.c:1109
 msgid "Create a readonly mapping"
 msgstr "Tạo một sự ánh xạ chỉ cho phép đọc"
 
-#: src/cryptsetup.c:1298 src/cryptsetup_reencrypt.c:1221
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "PBKDF2 iteration time for LUKS (in ms)"
 msgstr "Thời gian lặp lại PBKDF2 cho LUKS (theo mili-giây)"
 
-#: src/cryptsetup.c:1298 src/cryptsetup_reencrypt.c:1221
+#: src/cryptsetup.c:1110 src/cryptsetup_reencrypt.c:1149
 msgid "msecs"
 msgstr "mili-giây"
 
-#: src/cryptsetup.c:1299 src/cryptsetup_reencrypt.c:1222
+#: src/cryptsetup.c:1111 src/cryptsetup_reencrypt.c:1150
 msgid "Do not ask for confirmation"
 msgstr "Đừng yêu cầu xác nhận"
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1112
 msgid "Timeout for interactive passphrase prompt (in seconds)"
 msgstr "Thời hạn khi nhắc gõ cụm từ mật khẩu (theo giây)"
 
-#: src/cryptsetup.c:1300
+#: src/cryptsetup.c:1112
 msgid "secs"
 msgstr "giây"
 
-#: src/cryptsetup.c:1301 src/cryptsetup_reencrypt.c:1223
+#: src/cryptsetup.c:1113 src/cryptsetup_reencrypt.c:1151
 msgid "How often the input of the passphrase can be retried"
 msgstr "Số các lần có thể thử lại gõ cụm từ mật khẩu"
 
-#: src/cryptsetup.c:1302
+#: src/cryptsetup.c:1114
 msgid "Align payload at <n> sector boundaries - for luksFormat"
-msgstr "Sắp hàng trọng tải ở <n> biên giới rãnh ghi — cho định dạng luksFormat"
+msgstr "Sắp hàng trọng tải ở <n> biên giới rãnh ghi — cho định dạng `luksFormat'"
 
-#: src/cryptsetup.c:1303
+#: src/cryptsetup.c:1115
 msgid "File with LUKS header and keyslots backup."
 msgstr "Tập tin chứa bản sao lưu phần đầu và các khe khoá của thiết bị LUKS."
 
-#: src/cryptsetup.c:1304 src/cryptsetup_reencrypt.c:1224
+#: src/cryptsetup.c:1116 src/cryptsetup_reencrypt.c:1152
 msgid "Use /dev/random for generating volume key."
 msgstr "Sử dụng /dev/random để tạo khoá volume."
 
-#: src/cryptsetup.c:1305 src/cryptsetup_reencrypt.c:1225
+#: src/cryptsetup.c:1117 src/cryptsetup_reencrypt.c:1153
 msgid "Use /dev/urandom for generating volume key."
 msgstr "Sử dụng /dev/urandom để tạo khoá volume."
 
-#: src/cryptsetup.c:1306
+#: src/cryptsetup.c:1118
 msgid "Share device with another non-overlapping crypt segment."
 msgstr "Thiết bị chia sẻ với đoạn crypt không-chồng-lên-nhau khác."
 
-#: src/cryptsetup.c:1307 src/veritysetup.c:503
+#: src/cryptsetup.c:1119 src/veritysetup.c:385
 msgid "UUID for device to use."
 msgstr "UUID dành cho tập tin sử dụng."
 
-#: src/cryptsetup.c:1308
+#: src/cryptsetup.c:1120
 msgid "Allow discards (aka TRIM) requests for device."
 msgstr "Cho phép huỷ bỏ (được biết đến như là TRIM) các yêu cầu cho thiết bị."
 
-#: src/cryptsetup.c:1309
+#: src/cryptsetup.c:1121
 msgid "Device or file with separated LUKS header."
 msgstr "Thiết bị hay tập tin với phần đầu LUKS tách nhau."
 
-#: src/cryptsetup.c:1310
+#: src/cryptsetup.c:1122
 msgid "Do not activate device, just check passphrase."
 msgstr "Không kích hoạt thiết bị, chỉ cần kiểm tra mật khẩu."
 
-#: src/cryptsetup.c:1329 src/veritysetup.c:520
+#: src/cryptsetup.c:1140 src/veritysetup.c:402
 msgid "[OPTION...] <action> <action-specific>"
-msgstr "[TÙY_CHỌN...] <hành_vi> <đặc_trưng_cho_hành_vi>"
+msgstr "[TÙY_CHỌN...] <hành_động> <đặc_tả_hành_động>"
 
-#: src/cryptsetup.c:1369 src/veritysetup.c:557
+#: src/cryptsetup.c:1180 src/veritysetup.c:439
 msgid "Argument <action> missing."
-msgstr "Đối số <hành_vi> còn thiếu."
+msgstr "Đối số <hành_động> còn thiếu."
 
-#: src/cryptsetup.c:1375 src/veritysetup.c:563
+#: src/cryptsetup.c:1186 src/veritysetup.c:445
 msgid "Unknown action."
 msgstr "Hành động không rõ."
 
-#: src/cryptsetup.c:1390 src/veritysetup.c:578
+#: src/cryptsetup.c:1201 src/veritysetup.c:460
 #, c-format
 msgid "%s: requires %s as arguments"
 msgstr "%s: cần thiết %s làm đối số"
 
-#: src/cryptsetup.c:1399
+#: src/cryptsetup.c:1210
 msgid "Option --shared is allowed only for create operation.\n"
-msgstr "Tuỳ chọn --shared chỉ cho phép với thao tác tạo (create).\n"
+msgstr "Tùy chọn `--shared' chỉ cho phép với thao tác tạo (create).\n"
 
-#: src/cryptsetup.c:1407
+#: src/cryptsetup.c:1218
 msgid "Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"
-msgstr "Tuỳ chọn --allow-discards thì chỉ cho phép với thao tác luksOpen, loopaesOpen và tạo (create).\n"
+msgstr "Tùy chọn `--allow-discards' thì chỉ cho phép với thao tác `luksOpen', `loopaesOpen' và tạo (create).\n"
 
-#: src/cryptsetup.c:1415
+#: src/cryptsetup.c:1226
 msgid ""
 "Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n"
 "To limit read from keyfile use --keyfile-size=(bytes)."
 msgstr ""
-"Tuỳ chọn --key-size thì chỉ cho phép với các thao tác luksFormat, tạo (create) và loopaesOpen.\n"
-"Để giới hạn đọc từ tệp-tin-khoá sử dụng tuỳ chọn --keyfile-size=(bytes)."
+"Tùy chọn `--key-size' thì chỉ cho phép với các thao tác `luksFormat', tạo (create) và `loopaesOpen'.\n"
+"Để giới hạn đọc từ tệp-tin-khoá sử dụng tùy chọn `--keyfile-size=(bytes)'."
 
-#: src/cryptsetup.c:1422
+#: src/cryptsetup.c:1233
 msgid "Option --test-passphrase is allowed only for luksOpen.\n"
-msgstr "Tùy chọn --test-passphrase chỉ được phép cho luksOpen.\n"
+msgstr "Tùy chọn `--test-passphrase' chỉ được phép cho `luksOpen'.\n"
 
-#: src/cryptsetup.c:1427 src/cryptsetup_reencrypt.c:1298
+#: src/cryptsetup.c:1238 src/cryptsetup_reencrypt.c:1221
 msgid "Key size must be a multiple of 8 bits"
 msgstr "Kích cỡ khoá phải là bội số cho 8 bit"
 
-#: src/cryptsetup.c:1434 src/cryptsetup_reencrypt.c:1303
+#: src/cryptsetup.c:1245 src/cryptsetup_reencrypt.c:1226
 msgid "Key slot is invalid."
 msgstr "Khe khoá không đúng."
 
-#: src/cryptsetup.c:1441
+#: src/cryptsetup.c:1252
 msgid "Option --key-file takes precedence over specified key file argument.\n"
-msgstr "Tuỳ chọn --key-file giữ quyền ưu tiên cao hơn tham số tập tin khoá đã chỉ định.\n"
+msgstr "Tùy chọn --key-file giữ quyền ưu tiên cao hơn tham số tập tin khoá đã chỉ định.\n"
 
-#: src/cryptsetup.c:1449 src/veritysetup.c:585 src/cryptsetup_reencrypt.c:1282
+#: src/cryptsetup.c:1260 src/veritysetup.c:467 src/cryptsetup_reencrypt.c:1210
 msgid "Negative number for option not permitted."
-msgstr "Số âm cho tuỳ chọn là không được phép."
+msgstr "Tùy chọn không chấp nhận giá trị là số âm."
 
-#: src/cryptsetup.c:1453 src/cryptsetup_reencrypt.c:1275
-#: src/cryptsetup_reencrypt.c:1307
+#: src/cryptsetup.c:1264 src/cryptsetup_reencrypt.c:1204
+#: src/cryptsetup_reencrypt.c:1230
 msgid "Only one of --use-[u]random options is allowed."
-msgstr "Chỉ cho phép một tuỳ chọn --use-[u]random."
+msgstr "Chỉ cho phép một tùy chọn `--use-[u]random'."
 
-#: src/cryptsetup.c:1457
+#: src/cryptsetup.c:1268
 msgid "Option --use-[u]random is allowed only for luksFormat."
-msgstr "Tuỳ chọn --use-[u]random chỉ được phép cho luksFormat."
+msgstr "Tùy chọn `--use-[u]random' chỉ được phép cho `luksFormat'."
 
-#: src/cryptsetup.c:1461
+#: src/cryptsetup.c:1272
 msgid "Option --uuid is allowed only for luksFormat and luksUUID."
-msgstr "Tuỳ chọn --uuid thì chỉ cho phép với luksFormat và luksUUID."
+msgstr "Tùy chọn `--uuid' thì chỉ cho phép với `luksFormat' và `luksUUID'."
 
-#: src/cryptsetup.c:1465
+#: src/cryptsetup.c:1276
 msgid "Option --align-payload is allowed only for luksFormat."
-msgstr "Tuỳ chọn --align-payload chỉ được phép cho luksFormat."
+msgstr "Tùy chọn `--align-payload' chỉ được phép cho `luksFormat'."
 
-#: src/cryptsetup.c:1470
+#: src/cryptsetup.c:1281
 msgid "Option --skip is supported only for create and loopaesOpen commands.\n"
-msgstr "Tuỳ chọn --skip chỉ hỗ trợ cho lệnh tạo (create) và loopaesOpen.\n"
+msgstr "Tùy chọn `--skip' chỉ hỗ trợ cho lệnh tạo (create) và `loopaesOpen'.\n"
 
-#: src/cryptsetup.c:1475
+#: src/cryptsetup.c:1286
 msgid "Option --offset is supported only for create and loopaesOpen commands.\n"
-msgstr "Tuỳ chọn --offset chỉ hỗ trợ cho lệnh tạo (create) và loopaesOpen.\n"
+msgstr "Tùy chọn `--offset' chỉ hỗ trợ cho lệnh tạo (create) và `loopaesOpen'.\n"
 
-#: src/veritysetup.c:118
+#: src/veritysetup.c:56
 msgid "Invalid salt string specified.\n"
 msgstr "Chuỗi salt (muối) đã chỉ ra không hợp lệ.\n"
 
-#: src/veritysetup.c:198
+#: src/veritysetup.c:89
+#, c-format
+msgid "Cannot create hash image %s for writing.\n"
+msgstr "Không thể tạo ảnh băm %s để ghi.\n"
+
+#: src/veritysetup.c:148
 msgid "Invalid root hash string specified.\n"
 msgstr "Chuỗi mã băm gốc (thư mục root) đã chỉ ra không hợp lệ.\n"
 
-#: src/veritysetup.c:382
+#: src/veritysetup.c:308
 msgid "<data_device> <hash_device>"
 msgstr "<thiết-bị-dữ-liệu> <thiết-bị-băm>"
 
-#: src/veritysetup.c:382
+#: src/veritysetup.c:308
 msgid "format device"
 msgstr "định dạng thiết bị"
 
-#: src/veritysetup.c:383
+#: src/veritysetup.c:309
 msgid "<data_device> <hash_device> <root_hash>"
 msgstr "<thiết-bị-dữ-liệu> <thiết-bị-băm> <mã-băm-gốc>"
 
-#: src/veritysetup.c:383
+#: src/veritysetup.c:309
 msgid "verify device"
 msgstr "thẩm tra thiết bị"
 
-#: src/veritysetup.c:384
+#: src/veritysetup.c:310
 msgid "<name> <data_device> <hash_device> <root_hash>"
 msgstr "<tên> <thiết-bị-dữ-liệu> <thiết-bị-băm> <mã-băm-gốc>"
 
-#: src/veritysetup.c:384
+#: src/veritysetup.c:310
 msgid "create active device"
 msgstr "tạo thiết bị hoạt động"
 
-#: src/veritysetup.c:385
+#: src/veritysetup.c:311
 msgid "remove (deactivate) device"
 msgstr "gỡ bỏ (bất hoạt) thiết bị"
 
-#: src/veritysetup.c:386
+#: src/veritysetup.c:312
 msgid "show active device status"
 msgstr "hiển thị trạng thái các thiết bị đang hoạt động"
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:313
 msgid "<hash_device>"
 msgstr "<thiết_bị_băm>"
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:313
 msgid "show on-disk information"
 msgstr "hiển thị thông tin trên-đĩa"
 
-#: src/veritysetup.c:406
+#: src/veritysetup.c:332
 #, c-format
 msgid ""
 "\n"
@@ -1287,7 +1262,7 @@ msgstr ""
 "<thiết-bị-băm> là thiết bị chứa dữ liệu xác thực\n"
 "<mã-băm-gốc> mã băm của nút root (gốc) trên <thiết-bị-băm>\n"
 
-#: src/veritysetup.c:413
+#: src/veritysetup.c:339
 #, c-format
 msgid ""
 "\n"
@@ -1298,240 +1273,290 @@ msgstr ""
 "Các tham số compiled-in dm-verity mặc định:\n"
 "\tBăm: %s, Khối dữ liệu (bytes): %u, Khối băm (bytes): %u, Kích thước salt: %u, Định dạng băm: %u\n"
 
-#: src/veritysetup.c:495
+#: src/veritysetup.c:377
 msgid "Do not use verity superblock"
-msgstr "Không sử dụng siêu khối verity"
+msgstr "Không sử dụng siêu khối sự thực"
 
-#: src/veritysetup.c:496
+#: src/veritysetup.c:378
 msgid "Format type (1 - normal, 0 - original Chrome OS)"
 msgstr "Kiểu định dạng (1 - thông thường, 0 - Chrome OS nguyên gốc)"
 
-#: src/veritysetup.c:496
+#: src/veritysetup.c:378
 msgid "number"
 msgstr "số"
 
-#: src/veritysetup.c:497
+#: src/veritysetup.c:379
 msgid "Block size on the data device"
 msgstr "Kích cỡ khối trên thiết bị dữ liệu"
 
-#: src/veritysetup.c:498
+#: src/veritysetup.c:380
 msgid "Block size on the hash device"
 msgstr "Kích cỡ của khối trên thiết bị băm"
 
-#: src/veritysetup.c:499
+#: src/veritysetup.c:381
 msgid "The number of blocks in the data file"
 msgstr "Số lượng khối trong tập tin dữ liệu"
 
-#: src/veritysetup.c:499
+#: src/veritysetup.c:381
 msgid "blocks"
 msgstr "khối"
 
-#: src/veritysetup.c:500
+#: src/veritysetup.c:382
 msgid "Starting offset on the hash device"
 msgstr "Khoảng bù (offset) khởi đầu của thiết bị băm"
 
-#: src/veritysetup.c:501
+#: src/veritysetup.c:383
 msgid "Hash algorithm"
 msgstr "Thuật toán băm dữ liệu"
 
-#: src/veritysetup.c:501
+#: src/veritysetup.c:383
 msgid "string"
 msgstr "chuỗi"
 
-#: src/veritysetup.c:502
+#: src/veritysetup.c:384
 msgid "Salt"
 msgstr "Salt"
 
-#: src/veritysetup.c:502
+#: src/veritysetup.c:384
 msgid "hex string"
 msgstr "chuỗi hex"
 
-#: src/cryptsetup_reencrypt.c:220
+#: src/cryptsetup_reencrypt.c:164
 #, c-format
 msgid "Cannot exclusively open %s, device in use.\n"
 msgstr "Không thể mở %s một cách đệ qui, thiết bị vẫn đang được sử dụng.\n"
 
-#: src/cryptsetup_reencrypt.c:224
+#: src/cryptsetup_reencrypt.c:168
 #, c-format
 msgid "Cannot open device %s\n"
 msgstr "Không thể mở thiết bị %s\n"
 
-#: src/cryptsetup_reencrypt.c:234 src/cryptsetup_reencrypt.c:460
-#: src/cryptsetup_reencrypt.c:870
+#: src/cryptsetup_reencrypt.c:178 src/cryptsetup_reencrypt.c:406
+#: src/cryptsetup_reencrypt.c:822
 msgid "Allocation of aligned memory failed.\n"
 msgstr "Phân bổ bộ nhớ điều chỉnh gặp lỗi.\n"
 
-#: src/cryptsetup_reencrypt.c:252
+#: src/cryptsetup_reencrypt.c:185
+#, c-format
+msgid "Cannot read device %s.\n"
+msgstr "Không thể đọc thiết bị %s.\n"
+
+#: src/cryptsetup_reencrypt.c:196
 #, c-format
 msgid "Marking LUKS device %s unusable.\n"
-msgstr "Dánh dấu thiết bị LUKS %s là không thể dùng.\n"
+msgstr "Đánh dấu thiết bị LUKS %s là không thể dùng.\n"
 
-#: src/cryptsetup_reencrypt.c:257
+#: src/cryptsetup_reencrypt.c:201
 #, c-format
 msgid "Marking LUKS device %s usable.\n"
 msgstr "Đánh dấu thiết bị LUKS %s là có thể dùng.\n"
 
-#: src/cryptsetup_reencrypt.c:273
+#: src/cryptsetup_reencrypt.c:217
 #, c-format
 msgid "Cannot write device %s.\n"
 msgstr "Không thể ghi thiết bị %s.\n"
 
-#: src/cryptsetup_reencrypt.c:352
+#: src/cryptsetup_reencrypt.c:298
 msgid "Cannot write reencryption log file.\n"
-msgstr "Không thể ghi tập tin nhật trình reencryption.\n"
+msgstr "Không thể ghi tập tin nhật ký reencryption (mã hóa lại).\n"
 
-#: src/cryptsetup_reencrypt.c:401
+#: src/cryptsetup_reencrypt.c:347
 msgid "Cannot read reencryption log file.\n"
-msgstr "Không đọc được tập tin nhật trình reencryption.\n"
+msgstr "Không đọc được tập tin nhật ký reencryption.\n"
 
-#: src/cryptsetup_reencrypt.c:451
+#: src/cryptsetup_reencrypt.c:397
 #, c-format
-msgid "Log file %s exists, restarting reencryption.\n"
-msgstr "Tập tin nhật ký %s đã có sẵn rồi, đang khởi động lại reencryption.\n"
+msgid "Log file %s exists, resuming reencryption.\n"
+msgstr "Tập tin nhật ký %s đã có sẵn rồi, coi là reencryption (mã hóa thêm lần nữa).\n"
 
-#: src/cryptsetup_reencrypt.c:505
+#: src/cryptsetup_reencrypt.c:451
 msgid "Activation of temporary devices failed.\n"
 msgstr "Việc hoạt hóa các thiết bị tạm thời gặp lỗi.\n"
 
-#: src/cryptsetup_reencrypt.c:530
+#: src/cryptsetup_reencrypt.c:476
 #, c-format
 msgid "New LUKS header for device %s created.\n"
 msgstr "Phần đầu LUKS mới cho thiết bị %s được tạo.\n"
 
-#: src/cryptsetup_reencrypt.c:538
+#: src/cryptsetup_reencrypt.c:484
 #, c-format
 msgid "Activated keyslot %i.\n"
 msgstr "Khe-khoá (keyslot) đã được kích hoạt %i.\n"
 
-#: src/cryptsetup_reencrypt.c:562
+#: src/cryptsetup_reencrypt.c:508
 #, c-format
 msgid "LUKS header backup of device %s created.\n"
 msgstr "Phần đầu sao lưu LUKS của thiết bị %s được tạo.\n"
 
-#: src/cryptsetup_reencrypt.c:590
+#: src/cryptsetup_reencrypt.c:536
 msgid "Creation of LUKS backup headers failed.\n"
 msgstr "Việc tạo phần đầu LUKS sao lưu dự phòng gặp lỗi.\n"
 
-#: src/cryptsetup_reencrypt.c:685
+#: src/cryptsetup_reencrypt.c:631
 #, c-format
 msgid "Cannot restore LUKS header on device %s.\n"
-msgstr "Phục hồi phần đầu LUKS trên thiết bị %s.\n"
+msgstr "Không thể phục hồi phần đầu LUKS trên thiết bị %s.\n"
 
-#: src/cryptsetup_reencrypt.c:687
+#: src/cryptsetup_reencrypt.c:633
 #, c-format
 msgid "LUKS header on device %s restored.\n"
 msgstr "Phần đầu LUKS trên thiết bị %s đã được phục hồi.\n"
 
-#: src/cryptsetup_reencrypt.c:719
+#: src/cryptsetup_reencrypt.c:665
 #, c-format
 msgid "Progress: %5.1f%%, ETA %02llu:%02llu, %4llu MiB written, speed %5.1f MiB/s%s"
 msgstr "Tiến trình: %5.1f%%, ETA %02llu:%02llu, %4llu MiB đã ghi, tốc độ %5.1f MiB/s%s"
 
-#: src/cryptsetup_reencrypt.c:735 src/cryptsetup_reencrypt.c:807
+#: src/cryptsetup_reencrypt.c:681 src/cryptsetup_reencrypt.c:757
 msgid "Cannot seek to device offset.\n"
 msgstr "Không thể di chuyển vị trí tới vị trí tương đối thiết bị.\n"
 
-#: src/cryptsetup_reencrypt.c:853 src/cryptsetup_reencrypt.c:859
+#: src/cryptsetup_reencrypt.c:803 src/cryptsetup_reencrypt.c:809
 msgid "Cannot open temporary LUKS header file.\n"
 msgstr "Không thể mở tập tin phần đầu LUKS tạm thời.\n"
 
-#: src/cryptsetup_reencrypt.c:865
+#: src/cryptsetup_reencrypt.c:815
 msgid "Cannot get device size.\n"
 msgstr "Không thể lấy kích cỡ thiết bị.\n"
 
-#: src/cryptsetup_reencrypt.c:887
+#: src/cryptsetup_reencrypt.c:839
 msgid "Interrupted by a signal.\n"
 msgstr "Bị ngắt bởi tín hiệu signal.\n"
 
-#: src/cryptsetup_reencrypt.c:889
+#: src/cryptsetup_reencrypt.c:841
 msgid "IO error during reencryption.\n"
 msgstr "Lỗi IO (V/R) trong quá trình reencryption.\n"
 
-#: src/cryptsetup_reencrypt.c:990
+#: src/cryptsetup_reencrypt.c:942
 msgid "Key file can be used only with --key-slot or with exactly one key slot active.\n"
 msgstr "Tập tin khóa có thể sử dụng với tùy chọn --key-slot hoặc với chính xác một khe khóa tích cực.\n"
 
-#: src/cryptsetup_reencrypt.c:1032
+#: src/cryptsetup_reencrypt.c:984
 msgid "Enter any LUKS passphrase: "
-msgstr "Nhập mật khẩu LUKS vào:"
+msgstr "Nhập mật khẩu LUKS vào: "
 
-#: src/cryptsetup_reencrypt.c:1039
+#: src/cryptsetup_reencrypt.c:991
 #, c-format
 msgid "Enter LUKS passphrase for key slot %u: "
 msgstr "Nhập mật khẩu LUKS cho khe khoá %u: "
 
-#: src/cryptsetup_reencrypt.c:1088
+#: src/cryptsetup_reencrypt.c:1040
 msgid "Cannot open reencryption log file.\n"
 msgstr "Không mở được tập tin nhật trình reencryption.\n"
 
-#: src/cryptsetup_reencrypt.c:1216
+#: src/cryptsetup_reencrypt.c:1144
 msgid "Reencryption block size"
 msgstr "Kích thước khối Reencryption"
 
-#: src/cryptsetup_reencrypt.c:1216
+#: src/cryptsetup_reencrypt.c:1144
 msgid "MiB"
 msgstr "MiB"
 
-#: src/cryptsetup_reencrypt.c:1226
+#: src/cryptsetup_reencrypt.c:1154
 msgid "Use direct-io when accesing devices."
 msgstr "Sử dụng vào ra trực tiếp khi truy cập các thiết bị."
 
-#: src/cryptsetup_reencrypt.c:1227
+#: src/cryptsetup_reencrypt.c:1155
 msgid "Use fsync after each block."
 msgstr "Sử dụng fsync sau mỗi khối."
 
-#: src/cryptsetup_reencrypt.c:1228
+#: src/cryptsetup_reencrypt.c:1156
 msgid "Update log file after every block."
 msgstr "Cập nhật tập tin nhật ký sau mỗi khối."
 
-#: src/cryptsetup_reencrypt.c:1229
+#: src/cryptsetup_reencrypt.c:1157
 msgid "Use only this slot (others will be disabled)."
 msgstr "Chỉ sử dụng khe này (những cái khác sẽ bị tắt đi)."
 
-#: src/cryptsetup_reencrypt.c:1232
+#: src/cryptsetup_reencrypt.c:1160
 msgid "Reduce data device size (move data offset). DANGEROUS!"
 msgstr "Giảm kích thước dữ liệu thiết bị (di chuyển offset dữ liệu). NGUY HIỂM!"
 
-#: src/cryptsetup_reencrypt.c:1233
+#: src/cryptsetup_reencrypt.c:1161
+msgid "Use only specified device size (ignore rest of device). DANGEROUS!"
+msgstr "Chỉ sử dụng kích thước dữ liệu thiết bị (bỏ qua phần còn lại của thiết bị). NGUY HIỂM!"
+
+#: src/cryptsetup_reencrypt.c:1162
 msgid "Create new header on not encrypted device."
 msgstr "Tạo phần đầu mới không trên thiết bị được mã hóa."
 
-#: src/cryptsetup_reencrypt.c:1249
+#: src/cryptsetup_reencrypt.c:1178
 msgid "[OPTION...] <device>"
 msgstr "[TÙY_CHỌN...] <thiết-bị>"
 
-#: src/cryptsetup_reencrypt.c:1263
+#: src/cryptsetup_reencrypt.c:1192
 msgid "WARNING: this is experimental code, it can completely break your data.\n"
 msgstr "CẢNH BÁO: đây chỉ là mã thử nghiệm, nó có thể phá hoại dữ liệu của bạn.\n"
 
-#: src/cryptsetup_reencrypt.c:1264
+#: src/cryptsetup_reencrypt.c:1193
 #, c-format
 msgid "Reencryption will change: volume key%s%s%s%s.\n"
 msgstr "Reencryption sẽ thay đổi: khóa dung tích%s%s%s%s.\n"
 
-#: src/cryptsetup_reencrypt.c:1265
+#: src/cryptsetup_reencrypt.c:1194
 msgid ", set hash to "
-msgstr ", đặt kiểu băm thành"
+msgstr ", đặt kiểu băm thành "
 
-#: src/cryptsetup_reencrypt.c:1266
+#: src/cryptsetup_reencrypt.c:1195
 msgid ", set cipher to "
-msgstr ", đặt mật mã thành"
+msgstr ", đặt mã hóa thành "
 
-#: src/cryptsetup_reencrypt.c:1271
+#: src/cryptsetup_reencrypt.c:1200
 msgid "Argument required."
 msgstr "Cần đối số."
 
-#: src/cryptsetup_reencrypt.c:1288
-msgid "Only values between 1MiB and 64 MiB allowed for reencryption block size."
-msgstr "Chỉ những giá trị nằm giữa 1MiB và 64 MiB là cho phép đối với kích thước khối reencryption."
+#: src/cryptsetup_reencrypt.c:1216
+msgid "Only values between 1 MiB and 64 MiB allowed for reencryption block size."
+msgstr "Chỉ những giá trị nằm giữa 1MiB và 64 MiB là cho phép đối với kích thước khối reencryption (mã hóa lại)."
+
+#: src/cryptsetup_reencrypt.c:1235 src/cryptsetup_reencrypt.c:1240
+msgid "Invalid device size specification."
+msgstr "Đặc tả kích thước thiết bị không đúng."
 
-#: src/cryptsetup_reencrypt.c:1293
+#: src/cryptsetup_reencrypt.c:1243
 msgid "Maximum device reduce size is 64 MiB."
 msgstr "Kích thước thu nhỏ thiết bị tối đa là 64 MiB."
 
-#: src/cryptsetup_reencrypt.c:1311
-msgid "Option --new must be used together with --reduce_device_size."
-msgstr "Tùy chọn --new phải được sử dụng cùng với --reduce_device_size."
+#: src/cryptsetup_reencrypt.c:1246
+msgid "Reduce size must be multiple of 512 bytes sector."
+msgstr "Kích cỡ giảm phải là bội số cung từ (sector) 512 byte"
+
+#: src/cryptsetup_reencrypt.c:1250
+msgid "Option --new must be used together with --reduce-device-size."
+msgstr "Tùy chọn `--new' phải được sử dụng cùng với `--reduce-device-size'."
+
+#: src/utils_tools.c:114
+msgid "Command successful.\n"
+msgstr "Câu lệnh đã chạy thành công.\n"
+
+#: src/utils_tools.c:128
+#, c-format
+msgid "Command failed with code %i"
+msgstr "Câu lệnh đã thất bại với mã %i"
+
+#~ msgid "Cannot open device %s for %s%s access.\n"
+#~ msgstr "Không thể mở thiết bị %s cho truy cập %s%s.\n"
+
+#~ msgid "exclusive "
+#~ msgstr "dành riêng"
+
+#~ msgid "writable"
+#~ msgstr "ghi được"
+
+#~ msgid "read-only"
+#~ msgstr "chỉ đọc"
+
+#~ msgid "WARNING!!! Possibly insecure memory. Are you root?\n"
+#~ msgstr "CẢNH BÁO!!! Có thể là vùng nhớ không an toàn. Bạn có đang chạy dưới quyền siêu người dùng (root) không?\n"
+
+#~ msgid "Unable to obtain sector size for %s"
+#~ msgstr "Không thể lấy kích cỡ rãnh ghi cho %s"
+
+#~ msgid "Failed to write to key storage.\n"
+#~ msgstr "Lỗi ghi khoá vào kho lưu khoá.\n"
+
+#~ msgid "Failed to read from key storage.\n"
+#~ msgstr "Lỗi đọc từ kho lưu khoá.\n"
 
 #~ msgid "Device %s is busy.\n"
 #~ msgstr "Thiết bị %s đang bận.\n"
@@ -1570,17 +1595,17 @@ msgstr "Tùy chọn --new phải được sử dụng cùng với --reduce_devic
 #~ msgstr "sửa đổi thiết bị hoạt động - BỊ PHẢN ĐỐI - xem trang hướng dẫn"
 
 #~ msgid ""
-#~ "The reload action is deprecated. Please use \"dmsetup reload\" in case you really need this functionality.\n"
+#~ "The reload action is deprecated. Please use`dmsetup reload' in case you really need this functionality.\n"
 #~ "WARNING: do not use reload to touch LUKS devices. If that is the case, hit Ctrl-C now.\n"
 #~ msgstr ""
-#~ "Hành động nạp lại bị phản đối. Hãy sử dụng \"dmsetup reload\" trong trường hợp bạn thực sự yêu cầu chức năng này.\n"
+#~ "Hành động nạp lại bị phản đối. Hãy sử dụng`dmsetup reload' trong trường hợp bạn thực sự yêu cầu chức năng này.\n"
 #~ "CẢNH BÁO: đừng sử dụng chức năng nạp lại để thao tác thiết bị kiểu LUKS. Trong trường hợp đó, bấm tổ hợp phím Ctrl-C ngay bây giờ.\n"
 
 #~ msgid "Obsolete option --non-exclusive is ignored.\n"
-#~ msgstr "Tuỳ chọn cũ \"--non-exclusive\" bị bỏ qua.\n"
+#~ msgstr "Tùy chọn cũ`--non-exclusive' bị bỏ qua.\n"
 
 #~ msgid "Read the key from a file (can be /dev/random)"
-#~ msgstr "Đọc khoá từ một tập tin nào đó (có thể là \"/dev/random\")"
+#~ msgstr "Đọc khoá từ một tập tin nào đó (có thể là`/dev/random')"
 
 #~ msgid "(Obsoleted, see man page.)"
 #~ msgstr "(Bị phản đối, xem trang hướng dẫn.)"