diff --git a/THANKS b/THANKS index ee1d23ec..170fa25a 100644 --- a/THANKS +++ b/THANKS @@ -1,7 +1,8 @@ version 2.7.12 -------------- Thanks to Minh Van Le for feedback and bugs report. Thanks to Ryan Schmidt -for feedback. Thanks to Adriano Rafael Gomes for feedback. +for feedback. Thanks to Adriano Rafael Gomes for feedback and to John Goerzen +for continuous support. version 2.7.11 -------------- diff --git a/doc/Notes.html b/doc/Notes.html index f7044331..6a5f44e8 100644 --- a/doc/Notes.html +++ b/doc/Notes.html @@ -2753,6 +2753,18 @@

Cross reference matrix

1.3.0 1.2.2 + + September 3rd, 2023 + 2.7.12 + 11.3 + 06 + 6.7.0 + 1.7.0 + 1.6.0 + 1.9.0 + 1.3.0 + 1.2.2 + diff --git a/man/dar.1 b/man/dar.1 index db836516..3861b2bb 100644 --- a/man/dar.1 +++ b/man/dar.1 @@ -1,4 +1,4 @@ -.TH DAR 1 "August 5th, 2023" +.TH DAR 1 "September 3rd, 2023" .UC 8 .SH NAME dar \- creates, tests, lists, extracts, compares, merges, isolates, repairs dar archives diff --git a/po/dar.pot b/po/dar.pot index cc68e46e..b761e204 100644 --- a/po/dar.pot +++ b/po/dar.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dar 2.7.11\n" +"Project-Id-Version: dar 2.7.12\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" "group_id=65612&atid=511612\n" -"POT-Creation-Date: 2023-08-04 20:51+0200\n" +"POT-Creation-Date: 2023-09-03 14:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2567,11 +2567,11 @@ msgstr "" msgid "Unknown atomic operator, or atomic not allowed with an argument: " msgstr "" -#: src/dar_suite/crit_action_cmd_line.cpp:508 +#: src/dar_suite/crit_action_cmd_line.cpp:511 msgid "Unknown character found while parsing conditional string: " msgstr "" -#: src/dar_suite/crit_action_cmd_line.cpp:517 +#: src/dar_suite/crit_action_cmd_line.cpp:520 msgid "Unknown expression found while parsing conditional string: " msgstr "" @@ -3514,141 +3514,141 @@ msgstr "" msgid "Error met while reading next entry: " msgstr "" -#: src/libdar/filtre.cpp:3142 +#: src/libdar/filtre.cpp:3148 #, c-format msgid "Adding only inode metadata to archive: %S" msgstr "" -#: src/libdar/filtre.cpp:3154 +#: src/libdar/filtre.cpp:3160 msgid "Resaving file without compression: " msgstr "" -#: src/libdar/filtre.cpp:3158 +#: src/libdar/filtre.cpp:3164 msgid "Delta saving file to archive: " msgstr "" -#: src/libdar/filtre.cpp:3162 +#: src/libdar/filtre.cpp:3168 #, c-format msgid "Adding %S to archive: %S" msgstr "" -#: src/libdar/filtre.cpp:3202 src/libdar/filtre.cpp:3214 +#: src/libdar/filtre.cpp:3208 src/libdar/filtre.cpp:3220 #, c-format msgid "building delta signature with block size of %d bytes" msgstr "" -#: src/libdar/filtre.cpp:3307 +#: src/libdar/filtre.cpp:3313 #, c-format msgid "" "Failed reading data CRC for %S, file may be damaged and will be marked dirty" msgstr "" -#: src/libdar/filtre.cpp:3350 +#: src/libdar/filtre.cpp:3356 #, c-format msgid "" "Failed setting storage size to zero for this file with missing data CRC, CRC " "error will be reported for that file while reading the repaired archive" msgstr "" -#: src/libdar/filtre.cpp:3380 +#: src/libdar/filtre.cpp:3386 msgid "Copied data does not match CRC" msgstr "" -#: src/libdar/filtre.cpp:3409 +#: src/libdar/filtre.cpp:3415 #, c-format msgid "Failed to set fadvise() for file %S, this is not crucial, no problem" msgstr "" -#: src/libdar/filtre.cpp:3560 +#: src/libdar/filtre.cpp:3566 msgid " : Failed resaving uncompressed the inode data" msgstr "" -#: src/libdar/filtre.cpp:3570 +#: src/libdar/filtre.cpp:3576 msgid "" " : Resaving uncompressed the inode data to gain space is not possible, " "keeping data compressed" msgstr "" -#: src/libdar/filtre.cpp:3614 +#: src/libdar/filtre.cpp:3620 #, c-format msgid "" "File has disappeared while we were reading it, cannot check whether it has " "changed during its backup: %S" msgstr "" -#: src/libdar/filtre.cpp:3672 +#: src/libdar/filtre.cpp:3678 #, c-format msgid "" "WARNING! File modified while reading it for backup. Performing retry %i of %i" msgstr "" -#: src/libdar/filtre.cpp:3689 +#: src/libdar/filtre.cpp:3695 msgid "" "WARNING! File modified while reading it for backup. No more retry for that " "file to not exceed the wasted byte limit. File is " msgstr "" -#: src/libdar/filtre.cpp:3696 +#: src/libdar/filtre.cpp:3702 msgid "" "WARNING! File modified while reading it for backup, but no more retry " "allowed: " msgstr "" -#: src/libdar/filtre.cpp:3718 +#: src/libdar/filtre.cpp:3724 msgid "Dumping delta signature structure for saved file: " msgstr "" -#: src/libdar/filtre.cpp:3874 +#: src/libdar/filtre.cpp:3852 msgid "Saving Extended Attributes for " msgstr "" -#: src/libdar/filtre.cpp:3909 +#: src/libdar/filtre.cpp:3887 #, c-format msgid "" "Computed EA CRC for file %S differs from what was stored in the archive, " "this file's EA may have been corrupted" msgstr "" -#: src/libdar/filtre.cpp:3956 +#: src/libdar/filtre.cpp:3934 msgid "Error saving Extended Attributes for " msgstr "" -#: src/libdar/filtre.cpp:3960 +#: src/libdar/filtre.cpp:3938 msgid "" "be advised that a CRC error will be reported for the EA of that file while " "sequentially reading the repaired archive" msgstr "" -#: src/libdar/filtre.cpp:3995 +#: src/libdar/filtre.cpp:3973 msgid "Saving Filesystem Specific Attributes for " msgstr "" -#: src/libdar/filtre.cpp:4028 +#: src/libdar/filtre.cpp:4006 #, c-format msgid "" "Computed FSA CRC for file %S differs from what was stored in the archive, " "this file's EA may have been corrupted" msgstr "" -#: src/libdar/filtre.cpp:4073 +#: src/libdar/filtre.cpp:4051 msgid "Error saving Filesystem Specific Attributes for " msgstr "" -#: src/libdar/filtre.cpp:4077 +#: src/libdar/filtre.cpp:4055 msgid "" "be advised that a CRC error will be reported for the FSA of that file while " "sequentially reading the repaired archive" msgstr "" -#: src/libdar/filtre.cpp:4635 +#: src/libdar/filtre.cpp:4613 msgid "Copying delta signature structure from the archive of reference: " msgstr "" -#: src/libdar/filtre.cpp:4665 +#: src/libdar/filtre.cpp:4643 msgid "Calculating delta signature from filesystem: " msgstr "" -#: src/libdar/filtre.cpp:4745 +#: src/libdar/filtre.cpp:4723 #, c-format msgid "" "Furtive read mode requires either root permission and FOWNER capability, " @@ -3805,21 +3805,21 @@ msgid "" "directory)" msgstr "" -#: src/libdar/filesystem_tools.cpp:582 +#: src/libdar/filesystem_tools.cpp:586 msgid "" "File the patch is about to be applied to is not the expected one, aborting " "the patch operation" msgstr "" -#: src/libdar/filesystem_tools.cpp:599 +#: src/libdar/filesystem_tools.cpp:603 msgid "Patch data does not match its CRC, archive corruption took place" msgstr "" -#: src/libdar/filesystem_tools.cpp:630 +#: src/libdar/filesystem_tools.cpp:634 msgid "Error met while checking the resulting patched file: " msgstr "" -#: src/libdar/filesystem_tools.cpp:757 +#: src/libdar/filesystem_tools.cpp:761 msgid "Copied data does not match expected CRC" msgstr "" @@ -4013,17 +4013,17 @@ msgid "" "permit to recover some files, at most)?" msgstr "" -#: src/libdar/i_archive.cpp:577 src/libdar/i_archive.cpp:2052 +#: src/libdar/i_archive.cpp:577 src/libdar/i_archive.cpp:2054 msgid "Compression_level must be between 1 and 9 included" msgstr "" -#: src/libdar/i_archive.cpp:579 src/libdar/i_archive.cpp:2054 +#: src/libdar/i_archive.cpp:579 src/libdar/i_archive.cpp:2056 msgid "" "\"first_file_size\" cannot be different from zero if \"file_size\" is equal " "to zero" msgstr "" -#: src/libdar/i_archive.cpp:581 src/libdar/i_archive.cpp:2056 +#: src/libdar/i_archive.cpp:581 src/libdar/i_archive.cpp:2058 msgid "Crypto block size must be greater than 10 bytes" msgstr "" @@ -4064,7 +4064,7 @@ msgid "" "resulting archive before removing the damaged one" msgstr "" -#: src/libdar/i_archive.cpp:944 src/libdar/i_archive.cpp:1401 +#: src/libdar/i_archive.cpp:944 src/libdar/i_archive.cpp:1403 msgid "This archive is not exploitable, check documentation for more" msgstr "" @@ -4074,7 +4074,7 @@ msgid "" "disable this message by asking not to restore file ownership" msgstr "" -#: src/libdar/i_archive.cpp:967 src/libdar/i_archive.cpp:1420 +#: src/libdar/i_archive.cpp:967 src/libdar/i_archive.cpp:1422 msgid "" "Cannot use in-place restoration as no in-place path is stored in the archive" msgstr "" @@ -4183,14 +4183,14 @@ msgstr "" msgid "no in-place path recorded" msgstr "" -#: src/libdar/i_archive.cpp:1150 src/libdar/i_archive.cpp:1488 +#: src/libdar/i_archive.cpp:1150 src/libdar/i_archive.cpp:1490 msgid "" "This archive is not exploitable, check the archive class usage in the API " "documentation" msgstr "" -#: src/libdar/i_archive.cpp:1248 src/libdar/i_archive.cpp:1740 -#: src/libdar/i_archive.cpp:1773 +#: src/libdar/i_archive.cpp:1248 src/libdar/i_archive.cpp:1742 +#: src/libdar/i_archive.cpp:1775 msgid "" "Fetching EA value while listing an archive is not possible in sequential " "read mode" @@ -4213,56 +4213,56 @@ msgid "" "catalogue is available, cannot provide slicing information, aborting" msgstr "" -#: src/libdar/i_archive.cpp:1338 +#: src/libdar/i_archive.cpp:1340 #, c-format msgid "Exception caught from archive_listing_callback execution: %s" msgstr "" -#: src/libdar/i_archive.cpp:1343 +#: src/libdar/i_archive.cpp:1345 msgid "Exception caught from archive_listing_callback execution" msgstr "" -#: src/libdar/i_archive.cpp:1372 +#: src/libdar/i_archive.cpp:1374 msgid "Error while listing archive contents: " msgstr "" -#: src/libdar/i_archive.cpp:1458 +#: src/libdar/i_archive.cpp:1460 msgid "Error while comparing archive with filesystem: " msgstr "" -#: src/libdar/i_archive.cpp:1500 +#: src/libdar/i_archive.cpp:1502 msgid "" "WARNING! This is an isolated catalogue, no data or EA is present in this " "archive, only the catalogue structure can be checked" msgstr "" -#: src/libdar/i_archive.cpp:1534 +#: src/libdar/i_archive.cpp:1536 msgid "A problem occurred while reading this archive contents: " msgstr "" -#: src/libdar/i_archive.cpp:1549 +#: src/libdar/i_archive.cpp:1551 msgid "Error while testing archive: " msgstr "" -#: src/libdar/i_archive.cpp:1598 +#: src/libdar/i_archive.cpp:1600 msgid "" "Isolation with delta signature is not possible on a just created archive (on-" "fly isolation)" msgstr "" -#: src/libdar/i_archive.cpp:2059 +#: src/libdar/i_archive.cpp:2061 msgid "" "nodump flag feature has not been activated at compilation time, it is thus " "not available" msgstr "" -#: src/libdar/i_archive.cpp:2086 +#: src/libdar/i_archive.cpp:2088 msgid "" "Cannot sequentially read an archive of reference when delta signature or " "delta patch is requested" msgstr "" -#: src/libdar/i_archive.cpp:2122 +#: src/libdar/i_archive.cpp:2124 #, c-format msgid "" "WARNING! The archive is located in the directory to backup, this may create " @@ -4271,80 +4271,80 @@ msgid "" "(see -h for help). Do you really want to continue?" msgstr "" -#: src/libdar/i_archive.cpp:2312 +#: src/libdar/i_archive.cpp:2314 msgid "Ready to start writing down the archive?" msgstr "" -#: src/libdar/i_archive.cpp:2360 +#: src/libdar/i_archive.cpp:2362 msgid "Building the catalog object..." msgstr "" -#: src/libdar/i_archive.cpp:2378 +#: src/libdar/i_archive.cpp:2380 #, c-format msgid "Error while fetching information for %S: " msgstr "" -#: src/libdar/i_archive.cpp:2442 +#: src/libdar/i_archive.cpp:2444 #, c-format msgid "" "Warning making a differential/incremental backup with a different root " "directory: %S <-> %S" msgstr "" -#: src/libdar/i_archive.cpp:2454 +#: src/libdar/i_archive.cpp:2456 msgid "Processing files for backup..." msgstr "" -#: src/libdar/i_archive.cpp:2534 +#: src/libdar/i_archive.cpp:2536 msgid "Processing files for merging..." msgstr "" -#: src/libdar/i_archive.cpp:2576 +#: src/libdar/i_archive.cpp:2578 msgid "Processing files for fixing..." msgstr "" -#: src/libdar/i_archive.cpp:2658 +#: src/libdar/i_archive.cpp:2660 msgid "" "Adding reference to files that have been destroyed since reference backup..." msgstr "" -#: src/libdar/i_archive.cpp:2713 +#: src/libdar/i_archive.cpp:2715 msgid "Error while saving data: " msgstr "" -#: src/libdar/i_archive.cpp:2739 +#: src/libdar/i_archive.cpp:2741 msgid "WARNING! Incorrect signature found for archive, continue anyway?" msgstr "" -#: src/libdar/i_archive.cpp:2782 +#: src/libdar/i_archive.cpp:2784 msgid "" "Cannot get data name of the archive, this archive is not completely " "initialized" msgstr "" -#: src/libdar/i_archive.cpp:2807 +#: src/libdar/i_archive.cpp:2809 msgid "" "This archive contains an isolated catalogue, it cannot be used for this " "operation. It can only be used as reference for a incremental/differential " "backup or as backup of the original archive's catalogue" msgstr "" -#: src/libdar/i_archive.cpp:2814 +#: src/libdar/i_archive.cpp:2816 msgid "" "LAX MODE: Archive seems to be only an isolated catalogue (no data in it), " "Can I assume data corruption occurred and consider the archive as being a " "real archive?" msgstr "" -#: src/libdar/i_archive.cpp:2819 +#: src/libdar/i_archive.cpp:2821 msgid "Error while fetching archive properties: " msgstr "" -#: src/libdar/i_archive.cpp:2844 +#: src/libdar/i_archive.cpp:2846 msgid "Sorry, file size is unknown at this step of the program." msgstr "" -#: src/libdar/i_archive.cpp:2943 +#: src/libdar/i_archive.cpp:2945 #, c-format msgid "" "libgcrypt version < %s. Ligcrypt used has a bug that leads md5 and sha1 hash " @@ -4448,12 +4448,12 @@ msgstr "" msgid "root has no parent directory" msgstr "" -#: src/libdar/criterium.cpp:412 +#: src/libdar/criterium.cpp:496 msgid "" "Cannot evaluate this crit_and criterium as no criterium has been added to it" msgstr "" -#: src/libdar/criterium.cpp:481 +#: src/libdar/criterium.cpp:565 msgid "" "Cannot evaluate this crit_or criterium as no criterium has been added to it" msgstr "" diff --git a/po/fr.po b/po/fr.po index 20e60d30..5e88841a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: DAR 2.7.0\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" "group_id=65612&atid=511612\n" -"POT-Creation-Date: 2023-08-04 20:51+0200\n" +"POT-Creation-Date: 2023-09-03 14:37+0200\n" "PO-Revision-Date: 2023-07-16 20:31+0200\n" "Last-Translator: Denis Corbin \n" "Language-Team: French \n" @@ -2842,13 +2842,13 @@ msgstr "Expression inconnue dans la politique d' msgid "Unknown atomic operator, or atomic not allowed with an argument: " msgstr "Opérateur unitaire inconnu ou non autorisé avec un argument : " -#: src/dar_suite/crit_action_cmd_line.cpp:508 +#: src/dar_suite/crit_action_cmd_line.cpp:511 msgid "Unknown character found while parsing conditional string: " msgstr "" "Caractère inconnu trouvé lors de l'analyse de la chaîne conditionnelle " "suivante : " -#: src/dar_suite/crit_action_cmd_line.cpp:517 +#: src/dar_suite/crit_action_cmd_line.cpp:520 msgid "Unknown expression found while parsing conditional string: " msgstr "" "Expression inconnue trouvée lors de l'analyse de la chaîne conditionnelle " @@ -3945,30 +3945,30 @@ msgstr "Echec de lecture du CRC pour les EA et FSA : " msgid "Error met while reading next entry: " msgstr "Erreur lors de la lecture de l'entrée suivante : " -#: src/libdar/filtre.cpp:3142 +#: src/libdar/filtre.cpp:3148 #, c-format msgid "Adding only inode metadata to archive: %S" msgstr "Enregistrement uniquement des métadonnées dans l'archive : %S" -#: src/libdar/filtre.cpp:3154 +#: src/libdar/filtre.cpp:3160 msgid "Resaving file without compression: " msgstr "Sauve à nouveau mais sans compression: " -#: src/libdar/filtre.cpp:3158 +#: src/libdar/filtre.cpp:3164 msgid "Delta saving file to archive: " msgstr "Sauvegarde sous forme de batch binaire: " -#: src/libdar/filtre.cpp:3162 +#: src/libdar/filtre.cpp:3168 #, c-format msgid "Adding %S to archive: %S" msgstr "Ajout de %S à l'archive : %S" -#: src/libdar/filtre.cpp:3202 src/libdar/filtre.cpp:3214 +#: src/libdar/filtre.cpp:3208 src/libdar/filtre.cpp:3220 #, c-format msgid "building delta signature with block size of %d bytes" msgstr "construction de signature delta avec des blocks de %d octets" -#: src/libdar/filtre.cpp:3307 +#: src/libdar/filtre.cpp:3313 #, c-format msgid "" "Failed reading data CRC for %S, file may be damaged and will be marked dirty" @@ -3976,7 +3976,7 @@ msgstr "" "Echec de lecture du CRC de données pour %S, le fichier est probablement " "abîmé et sera marqué comme sale" -#: src/libdar/filtre.cpp:3350 +#: src/libdar/filtre.cpp:3356 #, c-format msgid "" "Failed setting storage size to zero for this file with missing data CRC, CRC " @@ -3986,21 +3986,21 @@ msgstr "" "CRC, une erreur de CRC sera signalée pour ce fichier lors de la lecture de " "l'archive réparée" -#: src/libdar/filtre.cpp:3380 +#: src/libdar/filtre.cpp:3386 msgid "Copied data does not match CRC" msgstr "Les données copiées ne correspondent pas au CRC" -#: src/libdar/filtre.cpp:3409 +#: src/libdar/filtre.cpp:3415 #, c-format msgid "Failed to set fadvise() for file %S, this is not crucial, no problem" msgstr "" "Echec de fadvise() pour le fichier %S, ce n'est pas crucial, pas de problème" -#: src/libdar/filtre.cpp:3560 +#: src/libdar/filtre.cpp:3566 msgid " : Failed resaving uncompressed the inode data" msgstr " : Echec de la sauvegarde sans compression des données de l'inode" -#: src/libdar/filtre.cpp:3570 +#: src/libdar/filtre.cpp:3576 msgid "" " : Resaving uncompressed the inode data to gain space is not possible, " "keeping data compressed" @@ -4008,7 +4008,7 @@ msgstr "" " : Resauver sans compression les données de l'inode pour gagner de la place " "n'est pas possible, on conserve les données compressées" -#: src/libdar/filtre.cpp:3614 +#: src/libdar/filtre.cpp:3620 #, c-format msgid "" "File has disappeared while we were reading it, cannot check whether it has " @@ -4017,13 +4017,13 @@ msgstr "" "Le fichier a disparu alors que nous étions en train de le lire, impossible " "de vérifier s'il a changé lors de sa sauvegarde : %S" -#: src/libdar/filtre.cpp:3672 +#: src/libdar/filtre.cpp:3678 #, c-format msgid "" "WARNING! File modified while reading it for backup. Performing retry %i of %i" msgstr "ATTENTION ! Fichier modifié pendant sa sauvegarde. Tentative %i sur %i" -#: src/libdar/filtre.cpp:3689 +#: src/libdar/filtre.cpp:3695 msgid "" "WARNING! File modified while reading it for backup. No more retry for that " "file to not exceed the wasted byte limit. File is " @@ -4032,22 +4032,22 @@ msgstr "" "nouvelle tentative pour ce fichier afin de de pas dépasser la taille " "maximale de gaspillage autorisée. Le fichier est " -#: src/libdar/filtre.cpp:3696 +#: src/libdar/filtre.cpp:3702 msgid "" "WARNING! File modified while reading it for backup, but no more retry " "allowed: " msgstr "" "ATTENTION ! Fichier modifié pendant sa sauvegarde, plus de nouvelle tentative" -#: src/libdar/filtre.cpp:3718 +#: src/libdar/filtre.cpp:3724 msgid "Dumping delta signature structure for saved file: " msgstr "Enregistrement de la signature delta pour le fichier : " -#: src/libdar/filtre.cpp:3874 +#: src/libdar/filtre.cpp:3852 msgid "Saving Extended Attributes for " msgstr "Sauvegarde des Attributs Étendus de " -#: src/libdar/filtre.cpp:3909 +#: src/libdar/filtre.cpp:3887 #, c-format msgid "" "Computed EA CRC for file %S differs from what was stored in the archive, " @@ -4056,11 +4056,11 @@ msgstr "" "Le CRC calculé pour sur EA du fichier %S diffère de celui stocké dans " "l'archive, les EA de ce fichier sont probablement corrompus" -#: src/libdar/filtre.cpp:3956 +#: src/libdar/filtre.cpp:3934 msgid "Error saving Extended Attributes for " msgstr "Erreur lors de la sauvegarde des Attributs Étendus de " -#: src/libdar/filtre.cpp:3960 +#: src/libdar/filtre.cpp:3938 msgid "" "be advised that a CRC error will be reported for the EA of that file while " "sequentially reading the repaired archive" @@ -4068,12 +4068,12 @@ msgstr "" "Nota bene : une erreur de CRC sera signalée pour les EA de ce fichier lors " "d'une lecture séquentielle de l'archive réparée" -#: src/libdar/filtre.cpp:3995 +#: src/libdar/filtre.cpp:3973 msgid "Saving Filesystem Specific Attributes for " msgstr "" "Sauvegarde des attributs spécifiques au système de fichier Étendus pour " -#: src/libdar/filtre.cpp:4028 +#: src/libdar/filtre.cpp:4006 #, c-format msgid "" "Computed FSA CRC for file %S differs from what was stored in the archive, " @@ -4082,11 +4082,11 @@ msgstr "" "Le CRC calculé sur les FSA du fichier %S diffère de celui stocké dans " "l'archive, les FSA de ce fichier sont probablement corrompus" -#: src/libdar/filtre.cpp:4073 +#: src/libdar/filtre.cpp:4051 msgid "Error saving Filesystem Specific Attributes for " msgstr "Erreur lors de la sauvegarde des FSA de " -#: src/libdar/filtre.cpp:4077 +#: src/libdar/filtre.cpp:4055 msgid "" "be advised that a CRC error will be reported for the FSA of that file while " "sequentially reading the repaired archive" @@ -4094,15 +4094,15 @@ msgstr "" "Nota bene : une erreur de CRC sera signalée pour les FSA de ce fichier lors " "d'une lecture séquentielle de l'archive réparée" -#: src/libdar/filtre.cpp:4635 +#: src/libdar/filtre.cpp:4613 msgid "Copying delta signature structure from the archive of reference: " msgstr "Copie des signature delta depuis l'archive de référence : " -#: src/libdar/filtre.cpp:4665 +#: src/libdar/filtre.cpp:4643 msgid "Calculating delta signature from filesystem: " msgstr "Calcul de signature delta à partir du système de fichiers : " -#: src/libdar/filtre.cpp:4745 +#: src/libdar/filtre.cpp:4723 #, c-format msgid "" "Furtive read mode requires either root permission and FOWNER capability, " @@ -4280,7 +4280,7 @@ msgid "" "directory)" msgstr "Le chemin %s doit être un répertoire (ou un lien sur un répertoire)" -#: src/libdar/filesystem_tools.cpp:582 +#: src/libdar/filesystem_tools.cpp:586 msgid "" "File the patch is about to be applied to is not the expected one, aborting " "the patch operation" @@ -4288,16 +4288,16 @@ msgstr "" "Le fichier sur lequel le patch est sur le point d'être appliqué ne " "correspond pas à celui attendu, Abandon de l'opération" -#: src/libdar/filesystem_tools.cpp:599 +#: src/libdar/filesystem_tools.cpp:603 msgid "Patch data does not match its CRC, archive corruption took place" msgstr "Le patch ne correspond pas à son CRC, l'archive est corrompue" -#: src/libdar/filesystem_tools.cpp:630 +#: src/libdar/filesystem_tools.cpp:634 msgid "Error met while checking the resulting patched file: " msgstr "" "Erreur lors du contrôle du fichier résultant de l'application du patch : " -#: src/libdar/filesystem_tools.cpp:757 +#: src/libdar/filesystem_tools.cpp:761 msgid "Copied data does not match expected CRC" msgstr "Les données copiées ne correspondent pas au CRC" @@ -4519,11 +4519,11 @@ msgstr "" "en reste (ce qui peut prendre encore plus de temps et en tout état de cause, " "ne permettra au plus de récupérer que quelques fichiers) ?" -#: src/libdar/i_archive.cpp:577 src/libdar/i_archive.cpp:2052 +#: src/libdar/i_archive.cpp:577 src/libdar/i_archive.cpp:2054 msgid "Compression_level must be between 1 and 9 included" msgstr "\"Compression_level\" doit être compris entre 1 et 9 inclus" -#: src/libdar/i_archive.cpp:579 src/libdar/i_archive.cpp:2054 +#: src/libdar/i_archive.cpp:579 src/libdar/i_archive.cpp:2056 msgid "" "\"first_file_size\" cannot be different from zero if \"file_size\" is equal " "to zero" @@ -4531,7 +4531,7 @@ msgstr "" "\"first_file_size\" ne peut être différent de zéro si \"file_size est égal à " "zéro" -#: src/libdar/i_archive.cpp:581 src/libdar/i_archive.cpp:2056 +#: src/libdar/i_archive.cpp:581 src/libdar/i_archive.cpp:2058 msgid "Crypto block size must be greater than 10 bytes" msgstr "La taille d'un bloc de chiffrement doit être supérieure à 10 octets" @@ -4587,7 +4587,7 @@ msgstr "" "Réparation d'archive terminée. ATTENTION ! Il est fortement recommandé de " "tester l'archive resultante avant de supprimer celle qui est abîmée" -#: src/libdar/i_archive.cpp:944 src/libdar/i_archive.cpp:1401 +#: src/libdar/i_archive.cpp:944 src/libdar/i_archive.cpp:1403 msgid "This archive is not exploitable, check documentation for more" msgstr "" "Cette archive n'est pas exploitable, vérifier la documentation pour plus " @@ -4602,7 +4602,7 @@ msgstr "" "faire. Vous pouvez supprimer ce message en demandant à ne pas restaurer ces " "propriétés" -#: src/libdar/i_archive.cpp:967 src/libdar/i_archive.cpp:1420 +#: src/libdar/i_archive.cpp:967 src/libdar/i_archive.cpp:1422 msgid "" "Cannot use in-place restoration as no in-place path is stored in the archive" msgstr "" @@ -4721,7 +4721,7 @@ msgstr "chemin d'origine : %S" msgid "no in-place path recorded" msgstr "aucun chemin d'origine enregistré" -#: src/libdar/i_archive.cpp:1150 src/libdar/i_archive.cpp:1488 +#: src/libdar/i_archive.cpp:1150 src/libdar/i_archive.cpp:1490 msgid "" "This archive is not exploitable, check the archive class usage in the API " "documentation" @@ -4729,8 +4729,8 @@ msgstr "" "Cette archive n'est pas exploitable, vérifier la documentation de l'API pour " "plus d'informations" -#: src/libdar/i_archive.cpp:1248 src/libdar/i_archive.cpp:1740 -#: src/libdar/i_archive.cpp:1773 +#: src/libdar/i_archive.cpp:1248 src/libdar/i_archive.cpp:1742 +#: src/libdar/i_archive.cpp:1775 msgid "" "Fetching EA value while listing an archive is not possible in sequential " "read mode" @@ -4761,25 +4761,25 @@ msgstr "" "l'archive dont a été isolé le présent catalogue. Impossible de localiser les " "fichiers au sein de l'archive, arrêt des opérations." -#: src/libdar/i_archive.cpp:1338 +#: src/libdar/i_archive.cpp:1340 #, c-format msgid "Exception caught from archive_listing_callback execution: %s" msgstr "Exception attrapée depuis l'execution de archive_listing_callback : %s" -#: src/libdar/i_archive.cpp:1343 +#: src/libdar/i_archive.cpp:1345 msgid "Exception caught from archive_listing_callback execution" msgstr "Exception attrapée depuis l'execution de archive_listing_callback" -#: src/libdar/i_archive.cpp:1372 +#: src/libdar/i_archive.cpp:1374 msgid "Error while listing archive contents: " msgstr "Erreur lors de l'affichage du contenu de l'archive : " -#: src/libdar/i_archive.cpp:1458 +#: src/libdar/i_archive.cpp:1460 msgid "Error while comparing archive with filesystem: " msgstr "" "Erreur pendant la comparaison de l'archive avec le système de fichiers : " -#: src/libdar/i_archive.cpp:1500 +#: src/libdar/i_archive.cpp:1502 msgid "" "WARNING! This is an isolated catalogue, no data or EA is present in this " "archive, only the catalogue structure can be checked" @@ -4787,15 +4787,15 @@ msgstr "" "ATTENTION ! Ceci est un catalogue isolé, aucune donnée ou AE n'est présent " "dans cette archive, seule la structure du catalogue peut être validée" -#: src/libdar/i_archive.cpp:1534 +#: src/libdar/i_archive.cpp:1536 msgid "A problem occurred while reading this archive contents: " msgstr "Une erreur est survenue lors de la lecture du contenu de l'archive : " -#: src/libdar/i_archive.cpp:1549 +#: src/libdar/i_archive.cpp:1551 msgid "Error while testing archive: " msgstr "Erreur lors du test de l'archive : " -#: src/libdar/i_archive.cpp:1598 +#: src/libdar/i_archive.cpp:1600 msgid "" "Isolation with delta signature is not possible on a just created archive (on-" "fly isolation)" @@ -4803,7 +4803,7 @@ msgstr "" "L'isolation avec signature delta est impossible en une seule opération " "(isolation à la volée)" -#: src/libdar/i_archive.cpp:2059 +#: src/libdar/i_archive.cpp:2061 msgid "" "nodump flag feature has not been activated at compilation time, it is thus " "not available" @@ -4811,7 +4811,7 @@ msgstr "" "La fonctionnalité --nodump n'a pas été activée lors de la compilation, cette " "option n'est donc pas disponible" -#: src/libdar/i_archive.cpp:2086 +#: src/libdar/i_archive.cpp:2088 msgid "" "Cannot sequentially read an archive of reference when delta signature or " "delta patch is requested" @@ -4819,7 +4819,7 @@ msgstr "" "Impossible de lire séquentiellement une archive de référence quand des " "signature delta ou des patch sont demandés" -#: src/libdar/i_archive.cpp:2122 +#: src/libdar/i_archive.cpp:2124 #, c-format msgid "" "WARNING! The archive is located in the directory to backup, this may create " @@ -4833,20 +4833,20 @@ msgstr "" "commande ou bien il faut changer l'archive de place (voir l'option -h pour " "l'aide). Voulez-vous vraiment continuer ?" -#: src/libdar/i_archive.cpp:2312 +#: src/libdar/i_archive.cpp:2314 msgid "Ready to start writing down the archive?" msgstr "Prêt à commencer l'écriture de l'archive ?" -#: src/libdar/i_archive.cpp:2360 +#: src/libdar/i_archive.cpp:2362 msgid "Building the catalog object..." msgstr "Construction de l'objet catalogue ..." -#: src/libdar/i_archive.cpp:2378 +#: src/libdar/i_archive.cpp:2380 #, c-format msgid "Error while fetching information for %S: " msgstr "Erreur lors de la recherche d'informations pour %S : " -#: src/libdar/i_archive.cpp:2442 +#: src/libdar/i_archive.cpp:2444 #, c-format msgid "" "Warning making a differential/incremental backup with a different root " @@ -4855,35 +4855,35 @@ msgstr "" "Attention création d'une archive différentielle/incrémentale avec un chemin " "racine (chemin d'origine) différent : %S <-> %S" -#: src/libdar/i_archive.cpp:2454 +#: src/libdar/i_archive.cpp:2456 msgid "Processing files for backup..." msgstr "Traitement des fichiers pour la sauvegarde ..." -#: src/libdar/i_archive.cpp:2534 +#: src/libdar/i_archive.cpp:2536 msgid "Processing files for merging..." msgstr "Traitement des fichier pour la fusion ..." -#: src/libdar/i_archive.cpp:2576 +#: src/libdar/i_archive.cpp:2578 msgid "Processing files for fixing..." msgstr "Traitement des fichier pour la réparation ..." -#: src/libdar/i_archive.cpp:2658 +#: src/libdar/i_archive.cpp:2660 msgid "" "Adding reference to files that have been destroyed since reference backup..." msgstr "" "Ajout des fichiers qui ont été détruits depuis la sauvegarde de référence ..." -#: src/libdar/i_archive.cpp:2713 +#: src/libdar/i_archive.cpp:2715 msgid "Error while saving data: " msgstr "Erreur lors de la sauvegarde des données : " -#: src/libdar/i_archive.cpp:2739 +#: src/libdar/i_archive.cpp:2741 msgid "WARNING! Incorrect signature found for archive, continue anyway?" msgstr "" "ATTENTION ! Signature incorrecte trouvée pour l'archive, on continue malgré " "tout ?" -#: src/libdar/i_archive.cpp:2782 +#: src/libdar/i_archive.cpp:2784 msgid "" "Cannot get data name of the archive, this archive is not completely " "initialized" @@ -4891,7 +4891,7 @@ msgstr "" "Impossible d'obtenir le nom de données de cette archive ; cette archive " "n'est pas complètement initialisée" -#: src/libdar/i_archive.cpp:2807 +#: src/libdar/i_archive.cpp:2809 msgid "" "This archive contains an isolated catalogue, it cannot be used for this " "operation. It can only be used as reference for a incremental/differential " @@ -4902,7 +4902,7 @@ msgstr "" "sauvegarde incrémentale/décrémentale ou comme secours du catalogue de " "l'archive d'origine" -#: src/libdar/i_archive.cpp:2814 +#: src/libdar/i_archive.cpp:2816 msgid "" "LAX MODE: Archive seems to be only an isolated catalogue (no data in it), " "Can I assume data corruption occurred and consider the archive as being a " @@ -4912,15 +4912,15 @@ msgstr "" "présente), Doit-on considérer qu'il s'agit plutôt d'une corruption et peut-" "on considérer que l'archive est une vraie archive ?" -#: src/libdar/i_archive.cpp:2819 +#: src/libdar/i_archive.cpp:2821 msgid "Error while fetching archive properties: " msgstr "Erreur lors de la recherche des propriétés de l'archive : " -#: src/libdar/i_archive.cpp:2844 +#: src/libdar/i_archive.cpp:2846 msgid "Sorry, file size is unknown at this step of the program." msgstr "Désolé, la taille du fichier est inconnue à cette étape du programme" -#: src/libdar/i_archive.cpp:2943 +#: src/libdar/i_archive.cpp:2945 #, c-format msgid "" "libgcrypt version < %s. Ligcrypt used has a bug that leads md5 and sha1 hash " @@ -5040,14 +5040,14 @@ msgstr "" msgid "root has no parent directory" msgstr "la racine n'a pas de répertoire père" -#: src/libdar/criterium.cpp:412 +#: src/libdar/criterium.cpp:496 msgid "" "Cannot evaluate this crit_and criterium as no criterium has been added to it" msgstr "" "Ne peut pas évaluer cet objet crit_and car aucun autre objet criterium n'y a " "été ajouté" -#: src/libdar/criterium.cpp:481 +#: src/libdar/criterium.cpp:565 msgid "" "Cannot evaluate this crit_or criterium as no criterium has been added to it" msgstr "" diff --git a/po/sv.po b/po/sv.po index 6f46be1b..5c797c04 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" "group_id=65612&atid=511612\n" -"POT-Creation-Date: 2023-08-04 20:51+0200\n" +"POT-Creation-Date: 2023-09-03 14:37+0200\n" "PO-Revision-Date: 2012-04-15 11:28+0200\n" "Last-Translator: Peter Landgren \n" "Language-Team: Swedish \n" @@ -2789,11 +2789,11 @@ msgstr "Okänt uttryck i överskrivningspolicy: " msgid "Unknown atomic operator, or atomic not allowed with an argument: " msgstr "Okänd 'atomic' operator eller 'atomic' ej tillÃ¥ten med ett argument: " -#: src/dar_suite/crit_action_cmd_line.cpp:508 +#: src/dar_suite/crit_action_cmd_line.cpp:511 msgid "Unknown character found while parsing conditional string: " msgstr "Okänt tecken hittat under kontroll av villkorssträng: " -#: src/dar_suite/crit_action_cmd_line.cpp:517 +#: src/dar_suite/crit_action_cmd_line.cpp:520 msgid "Unknown expression found while parsing conditional string: " msgstr "Okänt uttryck hittat under kontroll av villkorssträng: " @@ -3835,63 +3835,63 @@ msgstr "Fel vid läsning frÃ¥n fil: " msgid "Error met while reading next entry: " msgstr "Fel uppstÃ¥tt vid bearbetande av Ã¥tgärd: " -#: src/libdar/filtre.cpp:3142 +#: src/libdar/filtre.cpp:3148 #, fuzzy, c-format msgid "Adding only inode metadata to archive: %S" msgstr "Lägger till fil till arkiv: " -#: src/libdar/filtre.cpp:3154 +#: src/libdar/filtre.cpp:3160 msgid "Resaving file without compression: " msgstr "" -#: src/libdar/filtre.cpp:3158 +#: src/libdar/filtre.cpp:3164 #, fuzzy msgid "Delta saving file to archive: " msgstr "Lägger till fil till arkiv: " -#: src/libdar/filtre.cpp:3162 +#: src/libdar/filtre.cpp:3168 #, fuzzy, c-format msgid "Adding %S to archive: %S" msgstr "Lägger till fil till arkiv: " -#: src/libdar/filtre.cpp:3202 src/libdar/filtre.cpp:3214 +#: src/libdar/filtre.cpp:3208 src/libdar/filtre.cpp:3220 #, c-format msgid "building delta signature with block size of %d bytes" msgstr "" -#: src/libdar/filtre.cpp:3307 +#: src/libdar/filtre.cpp:3313 #, c-format msgid "" "Failed reading data CRC for %S, file may be damaged and will be marked dirty" msgstr "" -#: src/libdar/filtre.cpp:3350 +#: src/libdar/filtre.cpp:3356 #, c-format msgid "" "Failed setting storage size to zero for this file with missing data CRC, CRC " "error will be reported for that file while reading the repaired archive" msgstr "" -#: src/libdar/filtre.cpp:3380 +#: src/libdar/filtre.cpp:3386 msgid "Copied data does not match CRC" msgstr "Kopierade data matchar inte CRC" -#: src/libdar/filtre.cpp:3409 +#: src/libdar/filtre.cpp:3415 #, c-format msgid "Failed to set fadvise() for file %S, this is not crucial, no problem" msgstr "" -#: src/libdar/filtre.cpp:3560 +#: src/libdar/filtre.cpp:3566 msgid " : Failed resaving uncompressed the inode data" msgstr "" -#: src/libdar/filtre.cpp:3570 +#: src/libdar/filtre.cpp:3576 msgid "" " : Resaving uncompressed the inode data to gain space is not possible, " "keeping data compressed" msgstr "" -#: src/libdar/filtre.cpp:3614 +#: src/libdar/filtre.cpp:3620 #, c-format msgid "" "File has disappeared while we were reading it, cannot check whether it has " @@ -3900,7 +3900,7 @@ msgstr "" "Fil försvann medan den lästes, kan ej kontrollera huruvida den har ändrats " "under dess säkerhetskopiering: %S" -#: src/libdar/filtre.cpp:3672 +#: src/libdar/filtre.cpp:3678 #, c-format msgid "" "WARNING! File modified while reading it for backup. Performing retry %i of %i" @@ -3908,7 +3908,7 @@ msgstr "" "VARNING! Fil ändrad under läsning för säkerhetskopiering. Genomför nytt " "försök %i av %i" -#: src/libdar/filtre.cpp:3689 +#: src/libdar/filtre.cpp:3695 msgid "" "WARNING! File modified while reading it for backup. No more retry for that " "file to not exceed the wasted byte limit. File is " @@ -3916,7 +3916,7 @@ msgstr "" "VARNING! Fil ändrad vid läsning för säkerhetskopiering. Inga fler försök för " "den filen för att inte överskrida bortkastad byt-gräns. Fil är " -#: src/libdar/filtre.cpp:3696 +#: src/libdar/filtre.cpp:3702 msgid "" "WARNING! File modified while reading it for backup, but no more retry " "allowed: " @@ -3924,64 +3924,64 @@ msgstr "" "VARNING! Fil ändrad under läsning för säkerhetskopiering, men inga fler " "försök tillÃ¥tna: " -#: src/libdar/filtre.cpp:3718 +#: src/libdar/filtre.cpp:3724 msgid "Dumping delta signature structure for saved file: " msgstr "" -#: src/libdar/filtre.cpp:3874 +#: src/libdar/filtre.cpp:3852 msgid "Saving Extended Attributes for " msgstr "Sparar Extended Attribut för " -#: src/libdar/filtre.cpp:3909 +#: src/libdar/filtre.cpp:3887 #, c-format msgid "" "Computed EA CRC for file %S differs from what was stored in the archive, " "this file's EA may have been corrupted" msgstr "" -#: src/libdar/filtre.cpp:3956 +#: src/libdar/filtre.cpp:3934 msgid "Error saving Extended Attributes for " msgstr "Fel vid sparande av Extended Attribut för " -#: src/libdar/filtre.cpp:3960 +#: src/libdar/filtre.cpp:3938 msgid "" "be advised that a CRC error will be reported for the EA of that file while " "sequentially reading the repaired archive" msgstr "" -#: src/libdar/filtre.cpp:3995 +#: src/libdar/filtre.cpp:3973 #, fuzzy msgid "Saving Filesystem Specific Attributes for " msgstr "Sparar Extended Attribut för " -#: src/libdar/filtre.cpp:4028 +#: src/libdar/filtre.cpp:4006 #, c-format msgid "" "Computed FSA CRC for file %S differs from what was stored in the archive, " "this file's EA may have been corrupted" msgstr "" -#: src/libdar/filtre.cpp:4073 +#: src/libdar/filtre.cpp:4051 #, fuzzy msgid "Error saving Filesystem Specific Attributes for " msgstr "Fel vid sparande av Extended Attribut för " -#: src/libdar/filtre.cpp:4077 +#: src/libdar/filtre.cpp:4055 msgid "" "be advised that a CRC error will be reported for the FSA of that file while " "sequentially reading the repaired archive" msgstr "" -#: src/libdar/filtre.cpp:4635 +#: src/libdar/filtre.cpp:4613 #, fuzzy msgid "Copying delta signature structure from the archive of reference: " msgstr "Beaktar det (första) referensarkivet:" -#: src/libdar/filtre.cpp:4665 +#: src/libdar/filtre.cpp:4643 msgid "Calculating delta signature from filesystem: " msgstr "" -#: src/libdar/filtre.cpp:4745 +#: src/libdar/filtre.cpp:4723 #, c-format msgid "" "Furtive read mode requires either root permission and FOWNER capability, " @@ -4148,22 +4148,22 @@ msgstr "" "Den uppgivna sökvägen %s mÃ¥ste vara en mapp (eller en symbolisk länk till en " "befintlig mapp)" -#: src/libdar/filesystem_tools.cpp:582 +#: src/libdar/filesystem_tools.cpp:586 msgid "" "File the patch is about to be applied to is not the expected one, aborting " "the patch operation" msgstr "" -#: src/libdar/filesystem_tools.cpp:599 +#: src/libdar/filesystem_tools.cpp:603 msgid "Patch data does not match its CRC, archive corruption took place" msgstr "" -#: src/libdar/filesystem_tools.cpp:630 +#: src/libdar/filesystem_tools.cpp:634 #, fuzzy msgid "Error met while checking the resulting patched file: " msgstr "Fel vid skapande av hash handle: %s/%s" -#: src/libdar/filesystem_tools.cpp:757 +#: src/libdar/filesystem_tools.cpp:761 #, fuzzy msgid "Copied data does not match expected CRC" msgstr "Kopierade data matchar inte CRC" @@ -4380,11 +4380,11 @@ msgstr "" "(detta kan ta mycket tid och in vilket fall som helst kommer bara nÃ¥gra " "filer, som mest, att Ã¥terställas.)?" -#: src/libdar/i_archive.cpp:577 src/libdar/i_archive.cpp:2052 +#: src/libdar/i_archive.cpp:577 src/libdar/i_archive.cpp:2054 msgid "Compression_level must be between 1 and 9 included" msgstr "KompressionsnivÃ¥n mÃ¥ste ligga mellan 1 och 9, inklusive" -#: src/libdar/i_archive.cpp:579 src/libdar/i_archive.cpp:2054 +#: src/libdar/i_archive.cpp:579 src/libdar/i_archive.cpp:2056 msgid "" "\"first_file_size\" cannot be different from zero if \"file_size\" is equal " "to zero" @@ -4392,7 +4392,7 @@ msgstr "" "\"första_filstorleken\" kan inte vara skild frÃ¥n noll om \"filstorlek\" är " "lika med noll" -#: src/libdar/i_archive.cpp:581 src/libdar/i_archive.cpp:2056 +#: src/libdar/i_archive.cpp:581 src/libdar/i_archive.cpp:2058 msgid "Crypto block size must be greater than 10 bytes" msgstr "Krypteringsblockstorlek mÃ¥ste vara större än 10 byte" @@ -4439,7 +4439,7 @@ msgid "" "resulting archive before removing the damaged one" msgstr "" -#: src/libdar/i_archive.cpp:944 src/libdar/i_archive.cpp:1401 +#: src/libdar/i_archive.cpp:944 src/libdar/i_archive.cpp:1403 msgid "This archive is not exploitable, check documentation for more" msgstr "" "Detta arkiv kan inte utnyttjas, kontrollera dokumentationen för mer " @@ -4451,7 +4451,7 @@ msgid "" "disable this message by asking not to restore file ownership" msgstr "" -#: src/libdar/i_archive.cpp:967 src/libdar/i_archive.cpp:1420 +#: src/libdar/i_archive.cpp:967 src/libdar/i_archive.cpp:1422 msgid "" "Cannot use in-place restoration as no in-place path is stored in the archive" msgstr "" @@ -4566,7 +4566,7 @@ msgstr "" msgid "no in-place path recorded" msgstr "" -#: src/libdar/i_archive.cpp:1150 src/libdar/i_archive.cpp:1488 +#: src/libdar/i_archive.cpp:1150 src/libdar/i_archive.cpp:1490 msgid "" "This archive is not exploitable, check the archive class usage in the API " "documentation" @@ -4574,8 +4574,8 @@ msgstr "" "Detta arkiv kan inte utnyttjas, kontrollera, hur man använder arkivklassen, " "i API-dokumentationen" -#: src/libdar/i_archive.cpp:1248 src/libdar/i_archive.cpp:1740 -#: src/libdar/i_archive.cpp:1773 +#: src/libdar/i_archive.cpp:1248 src/libdar/i_archive.cpp:1742 +#: src/libdar/i_archive.cpp:1775 msgid "" "Fetching EA value while listing an archive is not possible in sequential " "read mode" @@ -4598,24 +4598,24 @@ msgid "" "catalogue is available, cannot provide slicing information, aborting" msgstr "" -#: src/libdar/i_archive.cpp:1338 +#: src/libdar/i_archive.cpp:1340 #, c-format msgid "Exception caught from archive_listing_callback execution: %s" msgstr "" -#: src/libdar/i_archive.cpp:1343 +#: src/libdar/i_archive.cpp:1345 msgid "Exception caught from archive_listing_callback execution" msgstr "" -#: src/libdar/i_archive.cpp:1372 +#: src/libdar/i_archive.cpp:1374 msgid "Error while listing archive contents: " msgstr "Fel vid listning av arkivinnehÃ¥ll: " -#: src/libdar/i_archive.cpp:1458 +#: src/libdar/i_archive.cpp:1460 msgid "Error while comparing archive with filesystem: " msgstr "Fel vid jämförelse mellan arkiv och filsystem: " -#: src/libdar/i_archive.cpp:1500 +#: src/libdar/i_archive.cpp:1502 msgid "" "WARNING! This is an isolated catalogue, no data or EA is present in this " "archive, only the catalogue structure can be checked" @@ -4623,21 +4623,21 @@ msgstr "" "VARNING! Detta är en isolerad katalog, inga data eller EA finns i detta " "arkiv, endast katalogstrukturen kan kontrolleras" -#: src/libdar/i_archive.cpp:1534 +#: src/libdar/i_archive.cpp:1536 msgid "A problem occurred while reading this archive contents: " msgstr "Ett problem inträffade vid läsning av innehÃ¥let i detta arkiv: " -#: src/libdar/i_archive.cpp:1549 +#: src/libdar/i_archive.cpp:1551 msgid "Error while testing archive: " msgstr "Fel vid arkivtest: " -#: src/libdar/i_archive.cpp:1598 +#: src/libdar/i_archive.cpp:1600 msgid "" "Isolation with delta signature is not possible on a just created archive (on-" "fly isolation)" msgstr "" -#: src/libdar/i_archive.cpp:2059 +#: src/libdar/i_archive.cpp:2061 msgid "" "nodump flag feature has not been activated at compilation time, it is thus " "not available" @@ -4645,13 +4645,13 @@ msgstr "" "--nodump-funktionen har ej aktiverats vid kompileringstillfället, sÃ¥lunda är " "den ej tillgängligt" -#: src/libdar/i_archive.cpp:2086 +#: src/libdar/i_archive.cpp:2088 msgid "" "Cannot sequentially read an archive of reference when delta signature or " "delta patch is requested" msgstr "" -#: src/libdar/i_archive.cpp:2122 +#: src/libdar/i_archive.cpp:2124 #, c-format msgid "" "WARNING! The archive is located in the directory to backup, this may create " @@ -4664,63 +4664,63 @@ msgstr "" "\"%S.*.%S\" till kommandoraden eller ändra platsen för arkivet. (se -h för " "hjälp) Vill du verkligen fortsätta?" -#: src/libdar/i_archive.cpp:2312 +#: src/libdar/i_archive.cpp:2314 msgid "Ready to start writing down the archive?" msgstr "Klart att börja skriva till arkivet?" -#: src/libdar/i_archive.cpp:2360 +#: src/libdar/i_archive.cpp:2362 msgid "Building the catalog object..." msgstr "" -#: src/libdar/i_archive.cpp:2378 +#: src/libdar/i_archive.cpp:2380 #, c-format msgid "Error while fetching information for %S: " msgstr "Fel vid hämtning av information för %S: " -#: src/libdar/i_archive.cpp:2442 +#: src/libdar/i_archive.cpp:2444 #, c-format msgid "" "Warning making a differential/incremental backup with a different root " "directory: %S <-> %S" msgstr "" -#: src/libdar/i_archive.cpp:2454 +#: src/libdar/i_archive.cpp:2456 msgid "Processing files for backup..." msgstr "" -#: src/libdar/i_archive.cpp:2534 +#: src/libdar/i_archive.cpp:2536 #, fuzzy msgid "Processing files for merging..." msgstr "Kontrollerar filers datumordning..." -#: src/libdar/i_archive.cpp:2576 +#: src/libdar/i_archive.cpp:2578 #, fuzzy msgid "Processing files for fixing..." msgstr "Kontrollerar filers datumordning..." -#: src/libdar/i_archive.cpp:2658 +#: src/libdar/i_archive.cpp:2660 msgid "" "Adding reference to files that have been destroyed since reference backup..." msgstr "" "Lägger till hänvisning till filer, som har förstörts sedan " "referensbackuppen..." -#: src/libdar/i_archive.cpp:2713 +#: src/libdar/i_archive.cpp:2715 msgid "Error while saving data: " msgstr "Fel vid datasparande: " -#: src/libdar/i_archive.cpp:2739 +#: src/libdar/i_archive.cpp:2741 msgid "WARNING! Incorrect signature found for archive, continue anyway?" msgstr "" -#: src/libdar/i_archive.cpp:2782 +#: src/libdar/i_archive.cpp:2784 msgid "" "Cannot get data name of the archive, this archive is not completely " "initialized" msgstr "" "Kan ej hämta datanamn för arkivet, detta arkiv är ej helt initialiserat" -#: src/libdar/i_archive.cpp:2807 +#: src/libdar/i_archive.cpp:2809 msgid "" "This archive contains an isolated catalogue, it cannot be used for this " "operation. It can only be used as reference for a incremental/differential " @@ -4731,7 +4731,7 @@ msgstr "" "säkerhetskopiering eller som säkerhetskopiering av det ursprungliga arkivets " "katalog" -#: src/libdar/i_archive.cpp:2814 +#: src/libdar/i_archive.cpp:2816 msgid "" "LAX MODE: Archive seems to be only an isolated catalogue (no data in it), " "Can I assume data corruption occurred and consider the archive as being a " @@ -4741,16 +4741,16 @@ msgstr "" "det). Kan det antagas att data förstörts och kan det arkivet betraktas som " "ett riktigt arkiv?" -#: src/libdar/i_archive.cpp:2819 +#: src/libdar/i_archive.cpp:2821 msgid "Error while fetching archive properties: " msgstr "Fel vid hämtning av arkivegenskaper: " -#: src/libdar/i_archive.cpp:2844 +#: src/libdar/i_archive.cpp:2846 #, fuzzy msgid "Sorry, file size is unknown at this step of the program." msgstr "Tyvärr, filstorleken är okänd vid detta stadium i programmet.\n" -#: src/libdar/i_archive.cpp:2943 +#: src/libdar/i_archive.cpp:2945 #, c-format msgid "" "libgcrypt version < %s. Ligcrypt used has a bug that leads md5 and sha1 hash " @@ -4864,13 +4864,13 @@ msgstr "" msgid "root has no parent directory" msgstr "rot har ingen föräldramapp" -#: src/libdar/criterium.cpp:412 +#: src/libdar/criterium.cpp:496 msgid "" "Cannot evaluate this crit_and criterium as no criterium has been added to it" msgstr "" "Kan ej utvärdera crit_and criterium dÃ¥ inget kriterium har lagts till det" -#: src/libdar/criterium.cpp:481 +#: src/libdar/criterium.cpp:565 msgid "" "Cannot evaluate this crit_or criterium as no criterium has been added to it" msgstr "" diff --git a/src/build/ChangeLog b/src/build/ChangeLog index 9f330652..cf58a0e2 100644 --- a/src/build/ChangeLog +++ b/src/build/ChangeLog @@ -3,11 +3,15 @@ from 2.7.11 to 2.7.12 binary patch. Added workaround to read archive format 11.2 (used for releases 2.7.9 to 2.7.11). Archive format has been updated to 11.3 while 2.7.12 generated backup have the exact same format as from 11.2, this - trick is only used to activate the workaround for badly generated backups -- adding new condition for overwriting policy (E letter), used to improve the - decremental backup when a file only change concerns its metadata (inode - information, like permission or ownership) -- fixing segmentation fault met when listing an archive content with -I option + trick is only used to activate the workaround for badly generated + backups +- adding new condition for overwriting policy (E letter), used to improve + the decremental backup when a file only change concerns its metadata + (inode information, like permission or ownership) +- fixing segmentation fault met when listing an archive content with + -I option +- fixing bug in testing routine that lead regression unseen and released + in 2.7.11. from 2.7.10 to 2.7.11 - removed set_unexpected() invocation (not useful for years in libdar diff --git a/src/build/configure.ac b/src/build/configure.ac index aea3de43..6ff16197 100644 --- a/src/build/configure.ac +++ b/src/build/configure.ac @@ -22,7 +22,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.69) -AC_INIT([DAR], [2.7.12.RC3], [[http://sourceforge.net/tracker/?group_id=65612&atid=511612]]) +AC_INIT([DAR], [2.7.12], [[http://sourceforge.net/tracker/?group_id=65612&atid=511612]]) AC_CONFIG_HEADERS([config.h]) AC_LANG([C++]) AC_CONFIG_SRCDIR([src/libdar/catalogue.cpp]) diff --git a/src/libdar/libdar5.hpp b/src/libdar/libdar5.hpp index 207785dd..c7900a3b 100644 --- a/src/libdar/libdar5.hpp +++ b/src/libdar/libdar5.hpp @@ -356,7 +356,7 @@ namespace libdar5 /// libdar Medium version defined at compilation time const U_I LIBDAR_COMPILE_TIME_MEDIUM = 201; /// libdar Minor version defined at compilation time - const U_I LIBDAR_COMPILE_TIME_MINOR = 3; + const U_I LIBDAR_COMPILE_TIME_MINOR = 4; //////////////////////////////////////////////////////////////////////// // LIBDAR INITIALIZATION METHODS //