summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2010-12-04 12:56:38 +0900
committerCaolán McNamara <caolanm@redhat.com>2010-12-05 20:23:29 +0000
commit60a9b5172bcbd90b5764125b76279c189dd5563c (patch)
tree50360c4fc74ab388941361230dbc9a4f8d76fb8b /setup_native
parent99b6172fb2ac2f2a3ea8df11ecbf63b5406b5705 (diff)
Replace all occured, occurance etc.
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/shellextensions/registerextensions.cxx10
-rw-r--r--setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx6
2 files changed, 8 insertions, 8 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 9075436e0412..aecd1057a067 100644
--- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -268,7 +268,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removing content of " + sCompleteFileName;
+ mystr = "An error occurred during removing content of " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
}
}
@@ -282,7 +282,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removal of file " + sCompleteFileName;
+ mystr = "An error occurred during removal of file " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
}
}
@@ -307,7 +307,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removal of empty directory " + sPath;
+ mystr = "An error occurred during removal of empty directory " + sPath;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
bDirectoryRemoved = false;
}
@@ -355,7 +355,7 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
// }
// else
// {
-// mystr = "An error occured during execution!";
+// mystr = "An error occurred during execution!";
// MessageBox(NULL, mystr.c_str(), "Command", MB_OK);
// }
@@ -420,7 +420,7 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle)
// }
// else
// {
-// mystr = "An error occured during execution!";
+// mystr = "An error occurred during execution!";
// MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK);
// }
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index badd20ae241e..aede073d68d7 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -132,7 +132,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removing content of " + sCompleteFileName;
+ mystr = "An error occurred during removing content of " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
}
}
@@ -146,7 +146,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removal of file " + sCompleteFileName;
+ mystr = "An error occurred during removal of file " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
}
}
@@ -171,7 +171,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removal of empty directory " + sPath;
+ mystr = "An error occurred during removal of empty directory " + sPath;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
bDirectoryRemoved = false;
}