Skip to content

Commit

Permalink
Merge pull request joncampbell123#4540 from skitt/spelling-fixes
Browse files Browse the repository at this point in the history
Various spelling fixes
  • Loading branch information
joncampbell123 authored Oct 17, 2023
2 parents cc5c25f + fac6d20 commit d3fca72
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions contrib/translations/en/en_US.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ You'll have to manually rename the newly created VHD image.

.
:PROGRAM_VHDMAKE_SUCCESS
New VHD image succesfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.
New VHD image successfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.

.
:PROGRAM_VHDMAKE_ERROPEN
Expand Down Expand Up @@ -1357,7 +1357,7 @@ into Fixed VHD.
-l | -link create a new Differencing VHD new.vhd and link it to the
pre-existing parent image parent.vhd
-f | -force force overwriting a pre-existing image file
-i | -info show useful informations about a.vhd image
-i | -info show useful information about a.vhd image
-m | -merge merge differencing delta.vhd to its parent
new.vhd name of the new Dynamic VHD image to create
size disk size (eventually with size unit, Bytes is implicit)
Expand Down
4 changes: 2 additions & 2 deletions contrib/translations/es/es_ES.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ You'll have to manually rename the newly created VHD image.

.
:PROGRAM_VHDMAKE_SUCCESS
New VHD image succesfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.
New VHD image successfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.

.
:PROGRAM_VHDMAKE_ERROPEN
Expand Down Expand Up @@ -1359,7 +1359,7 @@ into Fixed VHD.
-l | -link create a new Differencing VHD new.vhd and link it to the
pre-existing parent image parent.vhd
-f | -force force overwriting a pre-existing image file
-i | -info show useful informations about a.vhd image
-i | -info show useful information about a.vhd image
-m | -merge merge differencing delta.vhd to its parent
new.vhd name of the new Dynamic VHD image to create
size disk size (eventually with size unit, Bytes is implicit)
Expand Down
4 changes: 2 additions & 2 deletions contrib/translations/fr/fr_FR.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ You'll have to manually rename the newly created VHD image.

.
:PROGRAM_VHDMAKE_SUCCESS
New VHD image succesfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.
New VHD image successfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.

.
:PROGRAM_VHDMAKE_ERROPEN
Expand Down Expand Up @@ -1355,7 +1355,7 @@ into Fixed VHD.
-l | -link create a new Differencing VHD new.vhd and link it to the
pre-existing parent image parent.vhd
-f | -force force overwriting a pre-existing image file
-i | -info show useful informations about a.vhd image
-i | -info show useful information about a.vhd image
-m | -merge merge differencing delta.vhd to its parent
new.vhd name of the new Dynamic VHD image to create
size disk size (eventually with size unit, Bytes is implicit)
Expand Down
4 changes: 2 additions & 2 deletions contrib/translations/ko/ko_KR.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ You'll have to manually rename the newly created VHD image.

.
:PROGRAM_VHDMAKE_SUCCESS
New VHD image succesfully created. You can mount it with IMGMOUNT.
New VHD image successfully created. You can mount it with IMGMOUNT.

.
:PROGRAM_VHDMAKE_ERROPEN
Expand Down Expand Up @@ -1363,7 +1363,7 @@ into Fixed VHD.
-l | -link create a new Differencing VHD new.vhd and link it to the
pre-existing parent image parent.vhd
-f | -force force overwriting a pre-existing image file
-i | -info show useful informations about a.vhd image
-i | -info show useful information about a.vhd image
-m | -merge merge differencing delta.vhd to its parent
new.vhd name of the new Dynamic VHD image to create
size disk size (eventually with size unit, Bytes is implicit)
Expand Down
4 changes: 2 additions & 2 deletions contrib/translations/nl/nl_NL.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ You'll have to manually rename the newly created VHD image.

.
:PROGRAM_VHDMAKE_SUCCESS
New VHD image succesfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.
New VHD image successfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.

.
:PROGRAM_VHDMAKE_ERROPEN
Expand Down Expand Up @@ -1355,7 +1355,7 @@ into Fixed VHD.
-l | -link create a new Differencing VHD new.vhd and link it to the
pre-existing parent image parent.vhd
-f | -force force overwriting a pre-existing image file
-i | -info show useful informations about a.vhd image
-i | -info show useful information about a.vhd image
-m | -merge merge differencing delta.vhd to its parent
new.vhd name of the new Dynamic VHD image to create
size disk size (eventually with size unit, Bytes is implicit)
Expand Down
4 changes: 2 additions & 2 deletions contrib/translations/pt/pt_BR.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ You'll have to manually rename the newly created VHD image.

.
:PROGRAM_VHDMAKE_SUCCESS
New VHD image succesfully created. You can mount it with IMGMOUNT.
New VHD image successfully created. You can mount it with IMGMOUNT.

.
:PROGRAM_VHDMAKE_ERROPEN
Expand Down Expand Up @@ -1363,7 +1363,7 @@ into Fixed VHD.
-l | -link create a new Differencing VHD new.vhd and link it to the
pre-existing parent image parent.vhd
-f | -force force overwriting a pre-existing image file
-i | -info show useful informations about a.vhd image
-i | -info show useful information about a.vhd image
-m | -merge merge differencing delta.vhd to its parent
new.vhd name of the new Dynamic VHD image to create
size disk size (eventually with size unit, Bytes is implicit)
Expand Down
4 changes: 2 additions & 2 deletions contrib/translations/tr/tr_TR.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ You'll have to manually rename the newly created VHD image.

.
:PROGRAM_VHDMAKE_SUCCESS
New VHD image succesfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.
New VHD image successfully created. You can mount it with ←[34;1mIMGMOUNT←[0m.

.
:PROGRAM_VHDMAKE_ERROPEN
Expand Down Expand Up @@ -1356,7 +1356,7 @@ into Fixed VHD.
-l | -link create a new Differencing VHD new.vhd and link it to the
pre-existing parent image parent.vhd
-f | -force force overwriting a pre-existing image file
-i | -info show useful informations about a.vhd image
-i | -info show useful information about a.vhd image
-m | -merge merge differencing delta.vhd to its parent
new.vhd name of the new Dynamic VHD image to create
size disk size (eventually with size unit, Bytes is implicit)
Expand Down
4 changes: 2 additions & 2 deletions contrib/translations/zh/zh_CN.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@ You'll have to manually rename the newly created VHD image.

.
:PROGRAM_VHDMAKE_SUCCESS
New VHD image succesfully created. You can mount it with IMGMOUNT.
New VHD image successfully created. You can mount it with IMGMOUNT.

.
:PROGRAM_VHDMAKE_ERROPEN
Expand Down Expand Up @@ -1344,7 +1344,7 @@ into Fixed VHD.
-l | -link create a new Differencing VHD new.vhd and link it to the
pre-existing parent image parent.vhd
-f | -force force overwriting a pre-existing image file
-i | -info show useful informations about a.vhd image
-i | -info show useful information about a.vhd image
-m | -merge merge differencing delta.vhd to its parent
new.vhd name of the new Dynamic VHD image to create
size disk size (eventually with size unit, Bytes is implicit)
Expand Down
6 changes: 3 additions & 3 deletions src/dos/dos_programs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9524,7 +9524,7 @@ void DOS_SetupPrograms(void) {
MSG_Add("PROGRAM_VHDMAKE_WRITERR", "Could not write to new VHD image \"%s\", aborting.\n");
MSG_Add("PROGRAM_VHDMAKE_REMOVEERR", "Could not erase file \"%s\"\n");
MSG_Add("PROGRAM_VHDMAKE_RENAME", "You'll have to manually rename the newly created VHD image.\n");
MSG_Add("PROGRAM_VHDMAKE_SUCCESS", "New VHD image succesfully created. You can mount it with \033[34;1mIMGMOUNT\033[0m.\n");
MSG_Add("PROGRAM_VHDMAKE_SUCCESS", "New VHD image successfully created. You can mount it with \033[34;1mIMGMOUNT\033[0m.\n");
MSG_Add("PROGRAM_VHDMAKE_ERROPEN", "Error, could not open image file \"%s\".\n");
MSG_Add("PROGRAM_VHDMAKE_BADSIZE", "Bad VHD size specified, aborting!\n");
MSG_Add("PROGRAM_VHDMAKE_FNEEDED", "A pre-existing VHD image can't be silently overwritten without -f option!\n");
Expand All @@ -9542,7 +9542,7 @@ void DOS_SetupPrograms(void) {
MSG_Add("PROGRAM_VHDMAKE_ABSPATH_UX", "ERROR: an absolute path to parent inhibits portability.\nUse a path relative to differencing image file!\n");
MSG_Add("PROGRAM_VHDMAKE_HELP",
"Creates Dynamic or Differencing VHD images, converts raw images into Fixed VHD,\n"
"shows informations about VHD images and merges them.\n"
"shows information about VHD images and merges them.\n"
"\033[32;1mVHDMAKE\033[0m [-f] new.vhd size[BKMGT]\n"
"\033[32;1mVHDMAKE\033[0m \033[34;1m-convert\033[0m raw.hdd new.vhd\n"
"\033[32;1mVHDMAKE\033[0m [-f] \033[34;1m-link\033[0m parent.vhd new.vhd\n"
Expand All @@ -9552,7 +9552,7 @@ void DOS_SetupPrograms(void) {
" -l | -link create a new Differencing VHD new.vhd and link it to the\n"
" pre-existing parent image parent.vhd\n"
" -f | -force force overwriting a pre-existing image file\n"
" -i | -info show useful informations about a.vhd image\n"
" -i | -info show useful information about a.vhd image\n"
" -m | -merge merge differencing delta.vhd to its parent\n"
" new.vhd name of the new Dynamic VHD image to create\n"
" size disk size (eventually with size unit, Bytes is implicit)\n"
Expand Down
2 changes: 1 addition & 1 deletion src/ints/bios_vhd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ bool imageDiskVHD::MergeSnapshot(uint32_t* totalSectorsMerged, uint32_t* totalBl
}
LOG_MSG("Merged %d sectors in %d blocks", *totalSectorsMerged, *totalBlocksUpdated);
if (! ((imageDiskVHD*)parentDisk)->UpdateUUID() )
LOG_MSG("Warning: parent UUID not updated, invalid childs could exist around!");
LOG_MSG("Warning: parent UUID not updated, invalid children might remain!");
return true;
}

Expand Down

0 comments on commit d3fca72

Please sign in to comment.