From 25b9c0fcc3c84ebcb53fdcd4ad752d41bf09e14d Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 12 May 2017 18:34:47 +0200 Subject: [PATCH] Fix typos pointed out in bug #2264 --- bacula/LICENSE-FAQ | 4 +- bacula/LICENSE-FOSS | 2 +- bacula/src/dird/ua_purge.c | 2 +- bacula/src/dird/ua_status.c | 2 +- bacula/src/dird/ua_tree.c | 2 +- bacula/src/lib/address_conf.c | 2 +- bacula/src/qt-console/pages.h | 4 +- bacula/src/qt-console/prefs.ui | 2 +- bacula/src/qt-console/restore/prerestore.cpp | 8 +- bacula/src/qt-console/ts/bat_de.ts | 478 +++++++++--------- bacula/src/qt-console/ts/bat_fr.ts | 480 ++++++++++--------- bacula/src/stored/read_records.c | 2 +- 12 files changed, 499 insertions(+), 489 deletions(-) diff --git a/bacula/LICENSE-FAQ b/bacula/LICENSE-FAQ index d108a6b95d..7911fb4650 100644 --- a/bacula/LICENSE-FAQ +++ b/bacula/LICENSE-FAQ @@ -3,7 +3,7 @@ Note: This file is not the Bacula Community (bacula.org) license, which you will find in the LICENSE file. This is a FAQ about the -the Bacula AGPLv3 and the other third-party licenses used in certain +Bacula AGPLv3 and the other third-party licenses used in certain source code files of the Bacula software. @@ -112,7 +112,7 @@ Permissive licenses: Bacula can be enabled with data encryption and/or communications encryption. If this is the case, you will be including OpenSSL code that -that contains cryptographic software written by Eric Young +contains cryptographic software written by Eric Young (eay@cryptsoft.com) and also software written by Tim Hudson (tjh@cryptsoft.com). diff --git a/bacula/LICENSE-FOSS b/bacula/LICENSE-FOSS index e34e3c95ea..d18f7bcd72 100644 --- a/bacula/LICENSE-FOSS +++ b/bacula/LICENSE-FOSS @@ -52,7 +52,7 @@ no notification so they are not included here. However, the Bacula Community binary releases consist of files, with few source files (mostly scripts), and some of the FOSS licenses -such such as the BSD (Berkeley Software Development) require publication of +such as the BSD (Berkeley Software Development) require publication of the copyright notices if the code is released in binary format. For example certain copyright notifications are simplifed such as: diff --git a/bacula/src/dird/ua_purge.c b/bacula/src/dird/ua_purge.c index 75b268f7f5..3f6726016a 100644 --- a/bacula/src/dird/ua_purge.c +++ b/bacula/src/dird/ua_purge.c @@ -82,7 +82,7 @@ int purge_cmd(UAContext *ua, const char *cmd) /* Special case for the "Action On Purge", this option is working only on * Purged volume, so no jobs or files will be purged. - * We are skiping this message if "purge volume action=xxx" + * We are skipping this message if "purge volume action=xxx" */ if (!(find_arg(ua, "volume") >= 0 && find_arg(ua, "action") >= 0)) { ua->warning_msg(_( diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c index 97b25374d4..03f55e9316 100644 --- a/bacula/src/dird/ua_status.c +++ b/bacula/src/dird/ua_status.c @@ -559,7 +559,7 @@ static void do_storage_status(UAContext *ua, STORE *store, char *cmd) */ if (strcasecmp(cmd, "shstore") == 0) { if (!ua->argk[3]) { - ua->send_msg(_("Must have three aguments\n")); + ua->send_msg(_("Must have three arguments\n")); return; } pm_strcpy(devname, store->dev_name()); diff --git a/bacula/src/dird/ua_tree.c b/bacula/src/dird/ua_tree.c index 24ad9cf186..3ca5d51717 100644 --- a/bacula/src/dird/ua_tree.c +++ b/bacula/src/dird/ua_tree.c @@ -217,7 +217,7 @@ int insert_tree_handler(void *ctx, int num_fields, char **row) } else { tree->ua->warning_msg(_("Something is wrong with the Delta sequence of %s, " - "skiping new parts. Current sequence is %d\n"), + "skipping new parts. Current sequence is %d\n"), row[1], node->delta_seq); Dmsg3(0, "Something is wrong with Delta, skip it " diff --git a/bacula/src/lib/address_conf.c b/bacula/src/lib/address_conf.c index 52621103f7..ab96bd70ed 100644 --- a/bacula/src/lib/address_conf.c +++ b/bacula/src/lib/address_conf.c @@ -519,7 +519,7 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass) bstrncpy(hostname_str, lc->str, sizeof(hostname_str)); break; case EMPTYLINE: - scan_err0(lc, _("State machine missmatch")); + scan_err0(lc, _("State machine mismatch")); break; } token = lex_get_token(lc, T_SKIP_EOL); diff --git a/bacula/src/qt-console/pages.h b/bacula/src/qt-console/pages.h index 4c5ef5dfec..5467797c23 100644 --- a/bacula/src/qt-console/pages.h +++ b/bacula/src/qt-console/pages.h @@ -3,7 +3,7 @@ /* Bacula(R) - The Network Backup Solution - Copyright (C) 2000-2016 Kern Sibbald + Copyright (C) 2000-2017 Kern Sibbald The original author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -43,6 +43,8 @@ class Console; class Pages : public QWidget { + Q_OBJECT + public: /* methods */ Pages(); diff --git a/bacula/src/qt-console/prefs.ui b/bacula/src/qt-console/prefs.ui index 27c7dd107b..e86f10cc8c 100644 --- a/bacula/src/qt-console/prefs.ui +++ b/bacula/src/qt-console/prefs.ui @@ -450,7 +450,7 @@ - Debug Miscelaneous Items + Debug Miscellaneous Items diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp index 88c67fccd4..f2adb1f972 100644 --- a/bacula/src/qt-console/restore/prerestore.cpp +++ b/bacula/src/qt-console/restore/prerestore.cpp @@ -1,7 +1,7 @@ /* Bacula(R) - The Network Backup Solution - Copyright (C) 2000-2016 Kern Sibbald + Copyright (C) 2000-2017 Kern Sibbald The original author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -27,7 +27,7 @@ #include "bat.h" #include "restore.h" -/* Constructor to have job id list default in */ +/* Constructor to have jobid list default in */ prerestorePage::prerestorePage(QString &data, unsigned int datatype) : Pages() { m_dataIn = data; @@ -70,7 +70,7 @@ void prerestorePage::buildPage() if (m_dataInType == R_NONE) { selectJobRadio->setChecked(true); selectJobIdsRadio->setChecked(false); - jobIdEdit->setText(tr("Comma separted list of Job Ids")); + jobIdEdit->setText(tr("Comma separated list of JobIds")); jobIdEdit->setEnabled(false); } else if (m_dataInType == R_JOBIDLIST) { selectJobIdsRadio->setChecked(true); @@ -86,7 +86,7 @@ void prerestorePage::buildPage() } else if (m_dataInType == R_JOBDATETIME) { selectJobRadio->setChecked(true); selectJobIdsRadio->setChecked(false); - jobIdEdit->setText(tr("Comma separted list of Job Ids")); + jobIdEdit->setText(tr("Comma separated list of JobIds")); jobIdEdit->setEnabled(false); recentCheckBox->setCheckState(Qt::Unchecked); jobRadioClicked(true); diff --git a/bacula/src/qt-console/ts/bat_de.ts b/bacula/src/qt-console/ts/bat_de.ts index b7d8241b40..57c607cea9 100644 --- a/bacula/src/qt-console/ts/bat_de.ts +++ b/bacula/src/qt-console/ts/bat_de.ts @@ -57,42 +57,42 @@ ClientStat - + Client Status %1 - + Job Id - + Job Level - + Job Files - + Job Bytes - + Job Status - + Job Time - + Job Name @@ -182,7 +182,7 @@ p, li { white-space: pre-wrap; } - + Are you sure you want to purge all jobs of client "%1" ? The Purge command will delete associated Catalog database records from Jobs and Volumes without considering the retention period. Purge works only on the Catalog database and does not affect data written to Volumes. This command can be dangerous because you can delete catalog records associated with current backups of files, and we recommend that you do not use it unless you know what you are doing. @@ -192,7 +192,7 @@ Press OK to proceed with the purge operation? - + Client Status %1 @@ -200,22 +200,22 @@ Press OK to proceed with the purge operation? Console - + Console - + No Director found. - + Director not connected. Click on connect button. - + Director is currently disconnected Please reconnect! @@ -252,7 +252,7 @@ Please reconnect! Content - + Storage Status %1 @@ -384,7 +384,7 @@ Please reconnect! DirComm - + Already connected. @@ -392,72 +392,72 @@ Please reconnect! DirStat - - + + Job Id - - - + + + Job Level - + Job Files - + Job Bytes - + Job Status - - + + Job Time - - + + Job Name - + Job Type - + Priority - + Volume - + Job Data - + Job Info - + Director Status @@ -533,7 +533,7 @@ p, li { white-space: pre-wrap; } - + FileSet Name @@ -574,7 +574,7 @@ p, li { white-space: pre-wrap; } Help - + Help: %1 @@ -582,35 +582,35 @@ p, li { white-space: pre-wrap; } Job - + Job - + Are you sure you want to delete?? !!!. This delete command is used to delete a Job record and all associated catalog records that were created. This command operates only on the Catalog database and has no effect on the actual data written to a Volume. This command can be dangerous and we strongly recommend that you do not use it unless you know what you are doing. The Job and all its associated records (File and JobMedia) will be deleted from the catalog.Press OK to proceed with delete operation.? - + Are you sure you want to cancel this job? - + Bat - + There were no results! It is possible you may need to add "catalog = all" to the Messages resource for this job. - + Error: @@ -1510,64 +1510,64 @@ Press OK to continue? Jobs - + Jobs - - + + Job Name - + Pool - + Messages - + Client - + Storage - + Where - + Level - - + + Type - + FileSet - + Catalog - + Enabled @@ -1891,37 +1891,37 @@ Press OK to continue? MainWin - + Select Page - + Console - + Director Status - + Director not connected. Click on connect button. - + About bat - + <br><h2>Bacula Bat %1 (%2)</h2><p>Copyright &copy; 2007-%3 Kern Sibbald<p>The <b>bat</b> is an administrative console interface to the Director. - + Ready @@ -1947,19 +1947,19 @@ Press OK to continue? MediaInfo - + Media Info - + Are you sure you want to purge ?? !!!. The Purge command will delete associated Catalog database records from Jobs and Volumes without considering the retention period. Purge works only on the Catalog database and does not affect data written to Volumes. This command can be dangerous because you can delete catalog records associated with current backups of files, and we recommend that you do not use it unless you know what you are doing. Press OK to proceed with the purge operation? - + Are you sure you want to delete?? !!!. This delete command is used to delete a Volume record and all associated catalog records that were created. This command operates only on the Catalog database and has no effect on the actual data written to a Volume. This command can be dangerous and we strongly recommend that you do not use it unless you know what you are doing. All Jobs and all associated records (File and JobMedia) will be deleted from the catalog.Press OK to proceed with delete operation.? @@ -1968,124 +1968,124 @@ This delete command is used to delete a Volume record and all associated catalog MediaList - + Volume Name - + Id - + Status - + Enabled - + Bytes - + Files - + Jobs - + Retention - + Media Type - + Slot - + Use Duration - + Max Jobs - + Max Files - + Max Bytes - + Recycle - + Last Written - - + + Pools - + First Written - + Read Time - + Write Time - + Recycle Count - + Recycle Pool - + Are you sure you want to delete?? !!!. This delete command is used to delete a Volume record and all associated catalog records that were created. This command operates only on the Catalog database and has no effect on the actual data written to a Volume. This command can be dangerous and we strongly recommend that you do not use it unless you know what you are doing. All Jobs and all associated records (File and JobMedia) will be deleted from the catalog.Press OK to proceed with delete operation.? - + Are you sure you want to purge ?? !!!. The Purge command will delete associated Catalog database records from Jobs and Volumes without considering the retention period. Purge works only on the Catalog database and does not affect data written to Volumes. This command can be dangerous because you can delete catalog records associated with current backups of files, and we recommend that you do not use it unless you know what you are doing. Press OK to proceed with the purge operation? @@ -2164,19 +2164,19 @@ Press OK to proceed with the purge operation? MediaView - + Media - + Are you sure you want to purge ?? !!!. The Purge command will delete associated Catalog database records from Jobs and Volumes without considering the retention period. Purge works only on the Catalog database and does not affect data written to Volumes. This command can be dangerous because you can delete catalog records associated with current backups of files, and we recommend that you do not use it unless you know what you are doing. Press OK to proceed with the purge operation? - + Are you sure you want to delete?? !!!. This delete command is used to delete a Volume record and all associated catalog records that were created. This command operates only on the Catalog database and has no effect on the actual data written to a Volume. This command can be dangerous and we strongly recommend that you do not use it unless you know what you are doing. All Jobs and all associated records (File and JobMedia) will be deleted from the catalog.Press OK to proceed with delete operation.? @@ -2436,6 +2436,11 @@ This delete command is used to delete a Volume record and all associated catalog Debug Commands + + + Debug Miscellaneous Items + + Debug Sql queries @@ -2466,11 +2471,6 @@ This delete command is used to delete a Volume record and all associated catalog Debug multiple connection - - - Debug Miscelaneous Items - - RestoreTree @@ -2551,20 +2551,20 @@ This delete command is used to delete a Volume record and all associated catalog - - + + No - - + + Yes - + Invalid job status %1 @@ -2572,42 +2572,42 @@ This delete command is used to delete a Volume record and all associated catalog StorStat - + Storage Status %1 - + Job Id - + Job Level - + Job Files - + Job Bytes - + Job Status - + Job Time - + Job Name @@ -2711,98 +2711,98 @@ p, li { white-space: pre-wrap; } Storage - - + + Storage - + Name - + Id - + Changer - + Slot - + Status - + Enabled - + Pool - + Media Type - + Yes - + Status Storage "%1" - + Status Storage "%1" in Window - + Label media in Storage "%1" - + Mount media in Storage "%1" - + "UN" Mount media in Storage "%1" - + Release media in Storage "%1" - + Barcode Scan media in Storage "%1" - + Read scan media in Storage "%1" - + Storage Status %1 @@ -2879,7 +2879,7 @@ p, li { white-space: pre-wrap; } bRestore - + bRestore @@ -3208,7 +3208,7 @@ regexp: estimatePage - + Estimate @@ -3810,29 +3810,29 @@ p, li { white-space: pre-wrap; } mountDialog - + Storage : %1 - + No Storage name - + No Storage name given - + Context sensitive command : - + Director Response : @@ -3868,7 +3868,7 @@ p, li { white-space: pre-wrap; } prefsDialog - + Canceled @@ -3954,53 +3954,53 @@ p, li { white-space: pre-wrap; } prerestorePage - + Restore - - - + + + Any - - - Comma separted list of Job Ids + + + Comma separated list of JobIds - + Canceled - + There can be no spaces in the text for the joblist. Press OK to continue? - + The string is not a comma separated list of integers. Press OK to continue? - + Bat - + At least one of the jobs is not a valid job of type "Backup". Press OK to continue? - + All jobs in the list must be of the same jobName and same client. Press OK to continue? @@ -4057,22 +4057,22 @@ Press OK to continue? prunePage - + Prune - - - - - + + + + + Any - + Canceled @@ -4080,23 +4080,23 @@ Press OK to continue? relabelDialog - + From Volume : - + No Volume name - + No Volume name given - - + + New name must be different @@ -4245,75 +4245,75 @@ p, li { white-space: pre-wrap; } restorePage - + Restore Select - + Mark - + File - + Mode - + User - + Group - + Size - + Date - + In addDirectory cwd "%1" newdir "%2" fullpath "%3" - - + + Nothing selected, nothing done - + cd command failed - + .pwd command failed - + In else of if parent cwd "%1" newdir "%2" - + Canceled @@ -4321,182 +4321,182 @@ p, li { white-space: pre-wrap; } restoreTree - + Version Browser - + Directories - - - - - - + + + + + + Any - + Refresh From Re-Select - + Refresh From JobChecks - + Querying Database - + Querying Jobs - + Querying for Directories - + Processing Directories - + File Name - + Filename Id - - - + + + Task %1 of %2 - + No jobs were selected in the job query !!!. Press OK to continue - + Present Working Directory: %1 - - + + Job Id - - - + + + Type - - + + End Time - + Hash - + FileId - + Job Type - + First Volume - + RestoreTreePage - + Level - + Name - - + + Purged - - + + TU - - + + TD - + Task 1 of 3 - + Processing Checked directories - + Task 2 of 3 - + Processing Exceptions - + Task 3 of 3 - + Filling Database Table @@ -4685,33 +4685,33 @@ Press OK to continue runCmdPage - + Restore Run - - + + never - + always - + ifnewer - + ifolder - + Canceled @@ -4812,12 +4812,12 @@ Press OK to continue runPage - + Run - + Canceled @@ -4825,7 +4825,7 @@ Press OK to continue selectDialog - + Canceled @@ -4841,7 +4841,7 @@ Press OK to continue textInputDialog - + Canceled @@ -4862,7 +4862,7 @@ Press OK to continue yesnoPopUp - + Bat Question diff --git a/bacula/src/qt-console/ts/bat_fr.ts b/bacula/src/qt-console/ts/bat_fr.ts index 0faf64429d..9ff16a643a 100644 --- a/bacula/src/qt-console/ts/bat_fr.ts +++ b/bacula/src/qt-console/ts/bat_fr.ts @@ -57,42 +57,42 @@ ClientStat - + Client Status %1 État du client %1 - + Job Id Id du travail - + Job Level Niveau - + Job Files Fichiers - + Job Bytes Octets - + Job Status État - + Job Time Heure - + Job Name Nom @@ -185,7 +185,7 @@ p, li { white-space: pre-wrap; } Uname - + Are you sure you want to purge all jobs of client "%1" ? The Purge command will delete associated Catalog database records from Jobs and Volumes without considering the retention period. Purge works only on the Catalog database and does not affect data written to Volumes. This command can be dangerous because you can delete catalog records associated with current backups of files, and we recommend that you do not use it unless you know what you are doing. @@ -200,7 +200,7 @@ Comment vous persuader de clicker Annuler ? Vous ne désirez probablement pas fa Cliquer OK pour réaliser l'opération de purge ? - + Client Status %1 État du client %1 @@ -208,22 +208,22 @@ Cliquer OK pour réaliser l'opération de purge ? Console - + Console Console - + No Director found. Aucun Director trouvé. - + Director not connected. Click on connect button. Director déconnecté. Cliquer sur le bouton connexion. - + Director is currently disconnected Please reconnect! le Director est actuellement déconnecté @@ -261,7 +261,7 @@ Veuillez vous reconnecter ! Content - + Storage Status %1 Etat du dépôt %1 @@ -397,7 +397,7 @@ Veuillez vous reconnecter ! Bat - + Already connected. Déjà connecté. @@ -405,72 +405,72 @@ Veuillez vous reconnecter ! DirStat - - + + Job Id Id du travail - - - + + + Job Level Niveau - + Job Files Fichiers - + Job Bytes Octets - + Job Status État - - + + Job Time Heure - - + + Job Name Nom - + Job Type Type de travail - + Priority Priorité - + Volume Volume - + Job Data Données - + Job Info Information - + Director Status État du director @@ -565,7 +565,7 @@ p, li { white-space: pre-wrap; } - + FileSet Name Nom @@ -601,7 +601,7 @@ p, li { white-space: pre-wrap; } Help - + Help: %1 Aide : %1 @@ -609,28 +609,28 @@ p, li { white-space: pre-wrap; } Job - + Job Travail - + Are you sure you want to delete?? !!!. This delete command is used to delete a Job record and all associated catalog records that were created. This command operates only on the Catalog database and has no effect on the actual data written to a Volume. This command can be dangerous and we strongly recommend that you do not use it unless you know what you are doing. The Job and all its associated records (File and JobMedia) will be deleted from the catalog.Press OK to proceed with delete operation.? Êtes-vous sûr de vouloir détruire?? !!!.Cette commande est utilisée pour détruire un enregistrement "travail" et tous les enregistrements associés du catalogue. Cette commande influe uniquement sur le catalogue et n'a pas d'effet sur les données écrites sur un volume. Cette commande peut être dangereuse et nous vous recommandons fortement de ne pas l'utiliser, sauf si vous savez exactement ce que vous faites. Le travail et les autres enregistrements associés (fichiers et supports) seront détruits du catalogue. Cliquer OK pour réaliser la destruction ? - + Are you sure you want to cancel this job? Êtes-vous sûr de vouloir annuler ce travail ? - + Bat Bat - + There were no results! It is possible you may need to add "catalog = all" to the Messages resource for this job. @@ -639,7 +639,7 @@ Il se pourrait que vous deviez ajouter "catalog = all" à la ressource - + Error: Erreur : @@ -1556,64 +1556,64 @@ Cliquer OK pour continuer ? Jobs - + Jobs Travaux - - + + Job Name Nom du travail - + Pool Groupe - + Messages Messages - + Client Client - + Storage Dépôt - + Where Où - + Level Niveau - - + + Type Type - + FileSet Jeu de fichiers - + Catalog Catalogue - + Enabled Activé @@ -1945,12 +1945,12 @@ Cliquer OK pour continuer ? MainWin - + Director not connected. Click on connect button. le Director n'est pas connecté. Cliquer le bouton de connexion. - + About bat À propos de bat @@ -1959,27 +1959,27 @@ Cliquer OK pour continuer ? <br><h2>bat 1.0, par Dirk H Bartley et Kern Sibbald</h2><p>Copyright &copy; 2007- - + Ready Prêt - + Select Page Sélection d'onglet - + Console Console - + Director Status Etat du director - + <br><h2>Bacula Bat %1 (%2)</h2><p>Copyright &copy; 2007-%3 Kern Sibbald<p>The <b>bat</b> is an administrative console interface to the Director. @@ -2009,12 +2009,12 @@ Cliquer OK pour continuer ? MediaInfo - + Media Info Informations du support - + Are you sure you want to purge ?? !!!. The Purge command will delete associated Catalog database records from Jobs and Volumes without considering the retention period. Purge works only on the Catalog database and does not affect data written to Volumes. This command can be dangerous because you can delete catalog records associated with current backups of files, and we recommend that you do not use it unless you know what you are doing. Press OK to proceed with the purge operation? @@ -2023,7 +2023,7 @@ La commande de purge va détruire les enregistrements du catalogue associés (tr Cliquer OK pour réaliser la purge? - + Are you sure you want to delete?? !!!. This delete command is used to delete a Volume record and all associated catalog records that were created. This command operates only on the Catalog database and has no effect on the actual data written to a Volume. This command can be dangerous and we strongly recommend that you do not use it unless you know what you are doing. All Jobs and all associated records (File and JobMedia) will be deleted from the catalog.Press OK to proceed with delete operation.? Êtes-vous sûr de vouloir détruire?? !!!. @@ -2033,14 +2033,14 @@ Cette commande est utilisée pour détruire un enregistrement "volume" MediaList - + Are you sure you want to delete?? !!!. This delete command is used to delete a Volume record and all associated catalog records that were created. This command operates only on the Catalog database and has no effect on the actual data written to a Volume. This command can be dangerous and we strongly recommend that you do not use it unless you know what you are doing. All Jobs and all associated records (File and JobMedia) will be deleted from the catalog.Press OK to proceed with delete operation.? Êtes-vous sûr de vouloir détruire?? !!!. Cette commande est utilisée pour détruire un enregistrement "volume" et tous les enregistrements associés du catalogue. Cette commande influe uniquement sur le catalogue et n'a pas d'effet sur les données écritessur un volume. Cette commande peut être dangereuse et nous vous recommandons fortement de ne pas l'utiliser, sauf si vous savez exactement ce que vous faites. Tous les travaux et autres enregistrements associés (fichiers et supports) seront détruits du catalogue. Cliquer OK pour réaliser la destruction ? - + Are you sure you want to purge ?? !!!. The Purge command will delete associated Catalog database records from Jobs and Volumes without considering the retention period. Purge works only on the Catalog database and does not affect data written to Volumes. This command can be dangerous because you can delete catalog records associated with current backups of files, and we recommend that you do not use it unless you know what you are doing. Press OK to proceed with the purge operation? @@ -2049,113 +2049,113 @@ La commande de purge va détruire les enregistrements du catalogue associés (tr Cliquer OK pour réaliser la purge? - + Volume Name Nom de volume - + Id - + Status État - + Enabled Activé - + Bytes Octets - + Files Fichiers - + Jobs Travaux - + Retention Rétention - + Media Type Type de support - + Slot Slot - + Use Duration Durée d'utilisation - + Max Jobs nb max de travaux - + Max Files nb max de fichiers - + Max Bytes nb max d'octets - + Recycle Recycler - + Last Written Dernière écriture - - + + Pools Groupes - + First Written Première écriture - + Read Time Temps de lecture - + Write Time Temps d'écriture - + Recycle Count Compteur de recyclage - + Recycle Pool Groupe de recyclage @@ -2232,12 +2232,12 @@ Cliquer OK pour réaliser la purge? MediaView - + Media Support - + Are you sure you want to purge ?? !!!. The Purge command will delete associated Catalog database records from Jobs and Volumes without considering the retention period. Purge works only on the Catalog database and does not affect data written to Volumes. This command can be dangerous because you can delete catalog records associated with current backups of files, and we recommend that you do not use it unless you know what you are doing. Press OK to proceed with the purge operation? @@ -2246,7 +2246,7 @@ La commande de purge va détruire les enregistrements du catalogue associés (tr Cliquer OK pour réaliser la purge ? - + Are you sure you want to delete?? !!!. This delete command is used to delete a Volume record and all associated catalog records that were created. This command operates only on the Catalog database and has no effect on the actual data written to a Volume. This command can be dangerous and we strongly recommend that you do not use it unless you know what you are doing. All Jobs and all associated records (File and JobMedia) will be deleted from the catalog.Press OK to proceed with delete operation.? Êtes-vous sûr de vouloir détruire?? !!!. @@ -2525,9 +2525,13 @@ Cette commande est utilisée pour détruire un enregistrement "volume" Débogage des requêtes SQL - Debug Miscelaneous Items - Débogage divers + Débogage divers + + + + Debug Miscellaneous Items + @@ -2634,20 +2638,20 @@ Cette commande est utilisée pour détruire un enregistrement "volume" - - + + No Non - - + + Yes Oui - + Invalid job status %1 État de travail invalide : %1 @@ -2655,42 +2659,42 @@ Cette commande est utilisée pour détruire un enregistrement "volume" StorStat - + Storage Status %1 Etat du dépôt %1 - + Job Id Id du travail - + Job Level Niveau du Travail - + Job Files Fichiers - + Job Bytes Octets - + Job Status État - + Job Time Heure - + Job Name Nom @@ -2797,98 +2801,98 @@ p, li { white-space: pre-wrap; } Storage - - + + Storage Dépôt - + Name Nom - + Id Id - + Changer Changeur - + Slot Emplacement - + Status État - + Enabled Activé - + Pool Groupe - + Media Type Type de support - + Yes Oui - + Status Storage "%1" État du dépôt "%1" - + Status Storage "%1" in Window État du dépôt "%1" (dans une fenêtre) - + Label media in Storage "%1" Étiqueter le support dans le dépôt "%1" - + Mount media in Storage "%1" Monter le support dans le dépôt "%1" - + "UN" Mount media in Storage "%1" Démonter le support dans le dépôt "%1" - + Release media in Storage "%1" Libérer le support dans le dépôt "%1" - + Barcode Scan media in Storage "%1" Scanner le code-barre du support dans le dépôt "%1" - + Read scan media in Storage "%1" - + Storage Status %1 État du dépôt %1 @@ -2965,7 +2969,7 @@ p, li { white-space: pre-wrap; } bRestore - + bRestore b-Restauration @@ -3302,7 +3306,7 @@ regexp: estimatePage - + Estimate Estimer @@ -3910,22 +3914,22 @@ p, li { white-space: pre-wrap; } mountDialog - + Storage : %1 Dépôt : %1 - + No Storage name Pas de nom de dépôt - + No Storage name given Pas de nom de dépôt indiqué - + Context sensitive command : @@ -3934,7 +3938,7 @@ p, li { white-space: pre-wrap; } - + Director Response : @@ -3973,7 +3977,7 @@ p, li { white-space: pre-wrap; } prefsDialog - + Canceled Annulé @@ -4059,56 +4063,60 @@ p, li { white-space: pre-wrap; } prerestorePage - + Bat Bat - + There can be no spaces in the text for the joblist. Press OK to continue? Il ne peut pas y avoir d'espace dans la liste des travaux. Appuyer sur OK pour continuer ? - + + + Comma separated list of JobIds + + + + At least one of the jobs is not a valid job of type "Backup". Press OK to continue? Il y a au moins un travail qui n'est pas du type "Backup" (Sauvegarde). Appuyer sur OK pour continuer ? - + All jobs in the list must be of the same jobName and same client. Press OK to continue? Tous les travaux de la liste doivent avoir le même nom et le même Client. Appuyer sur OK pour continuer ? - + Restore Restaurer - - - + + + Any Tous - - Comma separted list of Job Ids - Liste de "id de travail" séparés par des virgules + Liste de "id de travail" séparés par des virgules - + Canceled Annulé - + The string is not a comma separated list of integers. Press OK to continue? La chaine n'est pas une liste de nombres séparés par des virgules. @@ -4166,22 +4174,22 @@ Appuyer sur OK pour continuer ? prunePage - + Prune Élaguer (prune) - - - - - + + + + + Any Tous - + Canceled Annulé @@ -4189,23 +4197,23 @@ Appuyer sur OK pour continuer ? relabelDialog - + From Volume : Volume : - + No Volume name Pas de nom de volume - + No Volume name given Pas de nom de Volume donné - - + + New name must be different Le nouveau nom doit être différent @@ -4361,75 +4369,75 @@ p, li { white-space: pre-wrap; } restorePage - + Restore Select Sélection pour restauration - + Mark Sélectionner - + File Fichier - + Mode Mode - + User Propriétaire - + Group Groupe - + Size Taille - + Date Date - + In else of if parent cwd "%1" newdir "%2" Dans le "else" du "if parent" cwd "%1" newdir "%2" - + Canceled Annulé - + In addDirectory cwd "%1" newdir "%2" fullpath "%3" Dans "addDirectory" cwd "%1" newdir "%2" fullpath "%3" - - + + Nothing selected, nothing done Rien de sélectionné, rien de fait - + cd command failed la commande cd a échoué - + .pwd command failed la commande ".pwd" a échoué @@ -4437,27 +4445,27 @@ p, li { white-space: pre-wrap; } restoreTree - + Version Browser Navigateur temporel - + Directories Dossiers - - - - - - + + + + + + Any Tous - + Refresh From JobChecks Rafraichir depuis JobChecks @@ -4466,158 +4474,158 @@ p, li { white-space: pre-wrap; } Taches - + Querying Database Interrogation en cours - + Querying Jobs Interrogation des travaux - + Querying for Directories Interrogation des dossiers - + Processing Directories Analyse des dossiers - + File Name Nom de fichier - + Filename Id Id du nom de fichier - - + + Job Id - - - + + + Type Type - - + + End Time Heure de fin - + Hash - + FileId FileId - + RestoreTreePage Onglet de l'arbre de restauration - + Level Niveau - + Name Nom - - + + Purged Purgé - - + + TU - - + + TD - + Refresh From Re-Select - - - + + + Task %1 of %2 Tâche %1 sur %2 - + No jobs were selected in the job query !!!. Press OK to continue La requête ne renvoie aucun travail !!! Cliquer OK pour continuer - + Present Working Directory: %1 Dossier de travail actuel : %1 - + Job Type Type de travail - + First Volume Premier volume - + Task 1 of 3 Tâche 1 sur 3 - + Processing Checked directories Traitement des dossiers - + Task 2 of 3 Tâche 2 sur 3 - + Processing Exceptions Traitement des exceptions - + Task 3 of 3 Tâche 3 sur 3 - + Filling Database Table Remplissage de la base de données @@ -4806,37 +4814,37 @@ Cliquer OK pour continuer runCmdPage - + Restore Run Restauration - - + + never jamais ... mais il faudrait retraduire dans okButtonPushed. never - + always toujours ... mais il faudrait retraduire dans okButtonPushed. always - + ifnewer si nouveau ... mais il faudrait retraduire dans okButtonPushed. si nouveau - + ifolder si plus vieux ... mais il faudrait retraduire dans okButtonPushed. si ancien - + Canceled Annulé @@ -4941,12 +4949,12 @@ Cliquer OK pour continuer runPage - + Run Lancer - + Canceled Annulé @@ -4954,7 +4962,7 @@ Cliquer OK pour continuer selectDialog - + Canceled Annulé @@ -4970,7 +4978,7 @@ Cliquer OK pour continuer textInputDialog - + Canceled Annulé @@ -4999,7 +5007,7 @@ Cliquer OK pour continuer yesnoPopUp - + Bat Question Bat Question diff --git a/bacula/src/stored/read_records.c b/bacula/src/stored/read_records.c index 72bb8b5df6..5b28576894 100644 --- a/bacula/src/stored/read_records.c +++ b/bacula/src/stored/read_records.c @@ -386,7 +386,7 @@ static bool try_repositioning(JCR *jcr, DEV_RECORD *rec, DCR *dcr) Dmsg2(dbglvl, "nextbsr=%p mount_next_volume=%d\n", bsr, jcr->bsr->mount_next_volume); if (bsr == NULL && jcr->bsr->mount_next_volume) { Dmsg0(dbglvl, "Would mount next volume here\n"); - Dmsg1(dbglvl, "Current postion Addr=%s\n", + Dmsg1(dbglvl, "Current position Addr=%s\n", dev->print_addr(ed1, sizeof(ed1))); jcr->bsr->mount_next_volume = false; if (!dev->at_eot()) { -- 2.39.5