Replace "harddisk" by "hard disk" and replace "is is" by "is"

See https://github.com/cgsecurity/testdisk/issues/110
This commit is contained in:
Christophe Grenier 2021-11-10 09:04:17 +01:00
parent 2944119f83
commit e8ebbf703d
5 changed files with 19 additions and 12 deletions

View file

@ -53,11 +53,11 @@
#define RO 1 #define RO 1
#define RW 0 #define RW 0
#define MAX_SEARCH_LOCATION 1024 #define MAX_SEARCH_LOCATION 1024
extern const arch_fnct_t arch_none;
extern const arch_fnct_t arch_gpt; extern const arch_fnct_t arch_gpt;
extern const arch_fnct_t arch_humax; extern const arch_fnct_t arch_humax;
extern const arch_fnct_t arch_i386; extern const arch_fnct_t arch_i386;
extern const arch_fnct_t arch_mac; extern const arch_fnct_t arch_mac;
extern const arch_fnct_t arch_none;
extern const arch_fnct_t arch_sun; extern const arch_fnct_t arch_sun;
extern const arch_fnct_t arch_xbox; extern const arch_fnct_t arch_xbox;
#ifdef HAVE_NCURSES #ifdef HAVE_NCURSES
@ -1344,6 +1344,13 @@ static void warning_geometry(const list_part_t *list_part, disk_t *disk, const i
} }
} }
/*@
@ requires valid_list_part(list_part_org);
@ requires valid_disk(disk_car);
@ requires \valid(current_cmd);
@ requires \valid(menu);
@ requires \valid(fast_mode);
@*/
static int ask_write_partition_table(const list_part_t *list_part_org, disk_t *disk_car, const int verbose, const int dump_ind, const int ask_part_order, const unsigned int expert, char **current_cmd, unsigned int *menu, int *fast_mode) static int ask_write_partition_table(const list_part_t *list_part_org, disk_t *disk_car, const int verbose, const int dump_ind, const int ask_part_order, const unsigned int expert, char **current_cmd, unsigned int *menu, int *fast_mode)
{ {
int res_interface_write; int res_interface_write;

View file

@ -924,7 +924,7 @@ void QPhotorec::qphotorec_about()
{ {
QPixmap pixmap_img = QPixmap(":res/photorec_64x64.png"); QPixmap pixmap_img = QPixmap(":res/photorec_64x64.png");
QMessageBox msg; QMessageBox msg;
msg.setText(tr("QPhotoRec is is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.\n\nQPhotoRec is is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with QPhotoRec. If not, see <http://www.gnu.org/licenses/>.")); msg.setText(tr("QPhotoRec is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.\n\nQPhotoRec is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with QPhotoRec. If not, see <http://www.gnu.org/licenses/>."));
msg.setWindowTitle(tr("QPhotoRec: About")); msg.setWindowTitle(tr("QPhotoRec: About"));
msg.addButton(QMessageBox::Close); msg.addButton(QMessageBox::Close);
msg.setIconPixmap(pixmap_img); msg.setIconPixmap(pixmap_img);