You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2013/10/08 17:16:53 UTC
svn commit: r1530306 - in /openoffice/trunk/main:
connectivity/source/resource/ desktop/win32/source/setup/
setup_native/source/win32/customactions/shellextensions/
Author: jsc
Date: Tue Oct 8 15:16:53 2013
New Revision: 1530306
URL: http://svn.apache.org/r1530306
Log:
#123428# correct spelling, occured -> occurred
Modified:
openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src
openoffice/trunk/main/desktop/win32/source/setup/setup.ulf
openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
Modified: openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src?rev=1530306&r1=1530305&r2=1530306&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src (original)
+++ openoffice/trunk/main/connectivity/source/resource/conn_shared_res.src Tue Oct 8 15:16:53 2013
@@ -123,7 +123,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED
String STR_UNSPECIFIED_ERROR
{
- Text [ en-US ] = "An unknown error occured.";
+ Text [ en-US ] = "An unknown error occurred.";
};
String STR_COULD_NOT_CREATE_ADDRESSBOOK
@@ -138,12 +138,12 @@ String STR_COULD_NOT_LOAD_LIB
String STR_ERROR_REFRESH_ROW
{
- Text [ en-US ] = "An error occured while refreshing the current row.";
+ Text [ en-US ] = "An error occurred while refreshing the current row.";
};
String STR_ERROR_GET_ROW
{
- Text [ en-US ] = "An error occured while getting the current row.";
+ Text [ en-US ] = "An error occurred while getting the current row.";
};
String STR_CAN_NOT_CANCEL_ROW_UPDATE
@@ -163,7 +163,7 @@ String STR_QUERY_INVALID_IS_NULL_COLUMN
String STR_ILLEGAL_MOVEMENT
{
- Text [ en-US ] = "Illegal cursor movement occured.";
+ Text [ en-US ] = "Illegal cursor movement occurred.";
};
String STR_COMMIT_ROW
@@ -375,7 +375,7 @@ String STR_NO_CONNECTION
// dbase
String STR_COULD_NOT_DELETE_INDEX
{
- Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occured.";
+ Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occurred.";
};
String STR_ONL_ONE_COLUMN_PER_INDEX
{
@@ -620,11 +620,11 @@ String STR_INVALID_FILE_URL
};
String STR_NO_TABLE_CONTAINER
{
- Text [ en-US ] = "An error occured while obtaining the connection's table container.";
+ Text [ en-US ] = "An error occurred while obtaining the connection's table container.";
};
String STR_NO_TABLE_EDITOR_DIALOG
{
- Text [ en-US ] = "An error occured while creating the table editor dialog.";
+ Text [ en-US ] = "An error occurred while creating the table editor dialog.";
};
String STR_NO_TABLENAME
{
Modified: openoffice/trunk/main/desktop/win32/source/setup/setup.ulf
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/win32/source/setup/setup.ulf?rev=1530306&r1=1530305&r2=1530306&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/win32/source/setup/setup.ulf (original)
+++ openoffice/trunk/main/desktop/win32/source/setup/setup.ulf Tue Oct 8 15:16:53 2013
@@ -67,7 +67,7 @@ en-US = "There is already a setup proces
[%UNKNOWN_ERROR%]
-en-US = "An Unknown Error occured!"
+en-US = "An Unknown Error occurred!"
[%INVALID_PROFILE%]
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx?rev=1530306&r1=1530305&r2=1530306&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx Tue Oct 8 15:16:53 2013
@@ -263,7 +263,7 @@ static BOOL RemoveCompleteDirectory( std
}
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);
}
}
@@ -277,7 +277,7 @@ static BOOL RemoveCompleteDirectory( std
}
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);
}
}
@@ -302,7 +302,7 @@ static BOOL RemoveCompleteDirectory( std
}
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;
}
@@ -339,13 +339,13 @@ extern "C" UINT __stdcall RegisterExtens
// }
// else
// {
-// mystr = "An error occured during execution!";
+// mystr = "An error occurred during execution!";
// MessageBox(NULL, mystr.c_str(), "Command", MB_OK);
// }
if ( ! fSuccess )
{
- mystr = "ERROR: An error occured during registration of extensions!";
+ mystr = "ERROR: An error occurred during registration of extensions!";
MessageBox(NULL, mystr.c_str(), "ERROR", MB_OK);
registrationError = true;
}
@@ -418,7 +418,7 @@ extern "C" UINT __stdcall RemoveExtensio
// }
// else
// {
-// mystr = "An error occured during execution!";
+// mystr = "An error occurred during execution!";
// MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK);
// }
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx?rev=1530306&r1=1530305&r2=1530306&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx Tue Oct 8 15:16:53 2013
@@ -127,7 +127,7 @@ static BOOL RemoveCompleteDirectory( std
}
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);
}
}
@@ -141,7 +141,7 @@ static BOOL RemoveCompleteDirectory( std
}
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);
}
}
@@ -166,7 +166,7 @@ static BOOL RemoveCompleteDirectory( std
}
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;
}