luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/diskcapa.c
View file

@ -48,7 +48,7 @@ static int interface_check_disk_capacity_ncurses(disk_t *disk_car)
wmove(stdscr,4,0); wmove(stdscr,4,0);
wprintw(stdscr,"%s\n",disk_car->description(disk_car)); wprintw(stdscr,"%s\n",disk_car->description(disk_car));
wmove(stdscr,6,0); wmove(stdscr,6,0);
wprintw(stdscr,"The Harddisk size seems to be 137GB."); wprintw(stdscr,"The Hard disk size seems to be 137GB.");
wmove(stdscr,7,0); wmove(stdscr,7,0);
wprintw(stdscr,"Support for 48-bit Logical Block Addressing (LBA) is needed to access"); wprintw(stdscr,"Support for 48-bit Logical Block Addressing (LBA) is needed to access");
wmove(stdscr,8,0); wmove(stdscr,8,0);

17
src/godmode.c
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
@ -189,11 +189,11 @@ static int interface_part_bad_ncurses(disk_t *disk_car, list_part_t *list_part)
char buffer_disk_size_found[100]; char buffer_disk_size_found[100];
size_to_unit(disk_car->disk_size, buffer_disk_size); size_to_unit(disk_car->disk_size, buffer_disk_size);
size_to_unit(disk_size, buffer_disk_size_found); size_to_unit(disk_size, buffer_disk_size_found);
wprintw(stdscr,"The harddisk (%s) seems too small! (< %s)", wprintw(stdscr,"The hard disk (%s) seems too small! (< %s)",
buffer_disk_size, buffer_disk_size_found); buffer_disk_size, buffer_disk_size_found);
} }
wmove(stdscr,7,0); wmove(stdscr,7,0);
wprintw(stdscr,"Check the harddisk size: HD jumper settings, BIOS detection..."); wprintw(stdscr,"Check the hard disk size: HD jumper settings, BIOS detection...");
#if defined(__CYGWIN__) || defined(__MINGW32__) #if defined(__CYGWIN__) || defined(__MINGW32__)
if(disk_car->disk_size<=((uint64_t)1<<(28-1)) && disk_size>=((uint64_t)1<<(28-1))) if(disk_car->disk_size<=((uint64_t)1<<(28-1)) && disk_size>=((uint64_t)1<<(28-1)))
{ {
@ -312,7 +312,7 @@ static int interface_part_bad_log(disk_t *disk_car, list_part_t *list_part)
} }
} }
log_warning("%s\n",disk_car->description(disk_car)); log_warning("%s\n",disk_car->description(disk_car));
log_warning("Check the harddisk size: HD jumper settings, BIOS detection...\n"); log_warning("Check the hard disk size: HD jumper settings, BIOS detection...\n");
#if defined(__CYGWIN__) || defined(__MINGW32__) #if defined(__CYGWIN__) || defined(__MINGW32__)
if(disk_car->disk_size<=((uint64_t)1<<(28-1)) && disk_size>=((uint64_t)1<<(28-1))) if(disk_car->disk_size<=((uint64_t)1<<(28-1)) && disk_size>=((uint64_t)1<<(28-1)))
{ {
@ -324,7 +324,7 @@ static int interface_part_bad_log(disk_t *disk_car, list_part_t *list_part)
char buffer_disk_size_found[100]; char buffer_disk_size_found[100];
size_to_unit(disk_car->disk_size, buffer_disk_size); size_to_unit(disk_car->disk_size, buffer_disk_size);
size_to_unit(disk_size, buffer_disk_size_found); size_to_unit(disk_size, buffer_disk_size_found);
log_warning("The harddisk (%s) seems too small! (< %s)\n", log_warning("The hard disk (%s) seems too small! (< %s)\n",
buffer_disk_size, buffer_disk_size_found); buffer_disk_size, buffer_disk_size_found);
} }
if(list_part->next==NULL) if(list_part->next==NULL)
@ -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;

2
src/hfsp_struct.h
View file

@ -99,7 +99,7 @@ typedef struct hfsp_vh {
uint32_t blocksize; // 28 uint32_t blocksize; // 28
// must be multiple of HFSPLUS_SECTOR_SIZE, // must be multiple of HFSPLUS_SECTOR_SIZE,
// should be a multiple of 4k for harddisk // should be a multiple of 4k for hard disk
uint32_t total_blocks; // 2C uint32_t total_blocks; // 2C
uint32_t free_blocks; // 30 uint32_t free_blocks; // 30
// The total number of unused allocation blocks on the disk. // The total number of unused allocation blocks on the disk.

2
src/nodisk.c
View file

@ -50,7 +50,7 @@ int intrf_no_disk_ncurses(const char *prog_name)
wmove(stdscr,5,0); wmove(stdscr,5,0);
wprintw(stdscr,"comes with ABSOLUTELY NO WARRANTY."); wprintw(stdscr,"comes with ABSOLUTELY NO WARRANTY.");
wmove(stdscr,7,0); wmove(stdscr,7,0);
wprintw(stdscr,"No harddisk found\n"); wprintw(stdscr,"No hard disk found\n");
#if defined(__CYGWIN__) || defined(__MINGW32__) #if defined(__CYGWIN__) || defined(__MINGW32__)
wmove(stdscr,8,0); wmove(stdscr,8,0);
wprintw(stdscr,"You need to be administrator to use %s.\n", prog_name); wprintw(stdscr,"You need to be administrator to use %s.\n", prog_name);

8
src/qphotorec.cpp
View file

@ -374,9 +374,9 @@ QWidget *QPhotorec::copyright(QWidget * qwparent)
int QPhotorec::no_disk_warning() int QPhotorec::no_disk_warning()
{ {
QString msg; QString msg;
msg=tr("No harddisk found"); msg=tr("No hard disk found");
#if defined(__CYGWIN__) || defined(__MINGW32__) #if defined(__CYGWIN__) || defined(__MINGW32__)
msg=tr("No harddisk found\n" msg=tr("No hard disk found\n"
"You need to be administrator to use this program.\n" "You need to be administrator to use this program.\n"
"Under Win9x, use the DOS version instead.\n" "Under Win9x, use the DOS version instead.\n"
"Under Vista or later, select this program, right-click and choose \"Run as administrator\"."); "Under Vista or later, select this program, right-click and choose \"Run as administrator\".");
@ -385,7 +385,7 @@ int QPhotorec::no_disk_warning()
#ifdef HAVE_GETEUID #ifdef HAVE_GETEUID
if(geteuid()!=0) if(geteuid()!=0)
{ {
msg=tr("No harddisk found\n" msg=tr("No hard disk found\n"
"You need to be root to use PhotoRec."); "You need to be root to use PhotoRec.");
} }
#endif #endif
@ -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);