cui/source/options/optsave.src |
2 +-
dbaccess/source/ui/tabledesign/TableController.cxx |
2 +-
libxmlsec/xmlsec1-customkeymanage.patch |
2 +-
officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs |
2 +-
shell/source/win32/ooofilereader/metainforeader.cxx |
4 ++--
shell/source/win32/shlxthandler/infotips/infotips.cxx |
6 +++---
xmlsecurity/tools/standalone/csfit/certmngr.cxx |
2 +-
xmlsecurity/tools/standalone/mscsfit/certmngr.cxx |
2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit c5710d4700e9b3ab854819cc8ce6c70d0654f5dc
Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com>
Date: Sun Nov 27 14:40:43 2011 +0700
s/infomation/information/
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 91c301c..da94bd4 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -230,7 +230,7 @@ TabPage RID_SFXPAGE_SAVE
Pos = MAP_APPFONT ( 23 , 169 ) ;
Size = MAP_APPFONT ( 239 , 8 ) ;
Hide = TRUE;
- Text [ en-US ] = "Not using ODF 1.2 Extended may cause infomation to
be lost.";
+ Text [ en-US ] = "Not using ODF 1.2 Extended may cause information to
be lost.";
Text [ x-comment ] = "EN-US, the term 'extended' must not be
translated.";
};
Image IMG_ODF_WARNING
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index b79eba4..cd5ca46 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -945,7 +945,7 @@ void OTableController::loadData()
if(aTypeIter == m_aTypeInfo.end())
aTypeIter = m_aTypeInfo.begin();
- OSL_ENSURE(aTypeIter != m_aTypeInfo.end(),"We have no type infomation!");
+ OSL_ENSURE(aTypeIter != m_aTypeInfo.end(),"We have no type information!");
bool bReadRow = !isAddAllowed();
for(sal_Int32 i=m_vRowList.size(); i < NEWCOLS; i++ )
diff --git a/libxmlsec/xmlsec1-customkeymanage.patch
b/libxmlsec/xmlsec1-customkeymanage.patch
index 8bc97c4..8a93368 100644
--- a/libxmlsec/xmlsec1-customkeymanage.patch
+++ b/libxmlsec/xmlsec1-customkeymanage.patch
@@ -796,7 +796,7 @@
+
+/**
+ * xmlSecNssAppliedKeysMngrCreate:
-+ * @slot: array of pointers to NSS PKCS#11 slot
infomation.
++ * @slot: array of pointers to NSS PKCS#11 slot
information.
+ * @cSlots: number of slots in the array
+ * @handler: the pointer to NSS certificate database.
+ *
diff --git
a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
index e2d420a..a4339cc 100644
---
a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
+++
b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
@@ -38,7 +38,7 @@
</prop>
<prop oor:name="HelpUrl" oor:type="xs:string">
<info>
- <desc>the url where additional infomation can be found.</desc>
+ <desc>the url where additional information can be found.</desc>
</info>
<value>http://wiki.documentfoundation.org/UX/LibreOffice_User_Feedback_Program</value>
</prop>
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx
b/shell/source/win32/ooofilereader/metainforeader.cxx
index 2f7a08d..2848de3 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -51,7 +51,7 @@ CBaseReader( DocumentName )
m_pSimple_Builder = new CSimpleTag( );
m_pDummy_Builder = new CDummyTag( );
- //retrieve all infomation that is useful
+ //retrieve all information that is useful
m_AllMetaInfo[META_INFO_AUTHOR] = EMPTY_XML_TAG;
m_AllMetaInfo[META_INFO_TITLE] = EMPTY_XML_TAG;
m_AllMetaInfo[META_INFO_SUBJECT] = EMPTY_XML_TAG;
@@ -92,7 +92,7 @@ try
m_pSimple_Builder = new CSimpleTag( );
m_pDummy_Builder = new CDummyTag( );
- //retrieve all infomation that is useful
+ //retrieve all information that is useful
m_AllMetaInfo[META_INFO_AUTHOR] = EMPTY_XML_TAG;
m_AllMetaInfo[META_INFO_TITLE] = EMPTY_XML_TAG;
m_AllMetaInfo[META_INFO_SUBJECT] = EMPTY_XML_TAG;
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx
b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 8c6d701..510ba0f 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -114,7 +114,7 @@ ULONG STDMETHODCALLTYPE CInfoTip::Release( void)
//********************helper functions for GetInfoTip
functions**********************
-/** get file type infomation from registry.
+/** get file type information from registry.
*/
std::wstring getFileTypeInfo(const std::string& file_extension)
{
@@ -191,7 +191,7 @@ std::wstring formatSizeOfFile( DWORD dwSize )
}
-/** get file size infomation.
+/** get file size information.
*/
std::wstring getFileSizeInfo(char* FileName)
{
@@ -279,7 +279,7 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD
/*dwFlags*/, wchar_t** ppws
{
}
- //display file size, no matter other infomation is loaded successfully or
not.
+ //display file size, no matter other information is loaded successfully or
not.
std::wstring tmpSizeStr = getFileSizeInfo( m_szFileName );
if ( tmpSizeStr != EMPTY_STRING )
{
diff --git a/xmlsecurity/tools/standalone/csfit/certmngr.cxx
b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
index d0096a9..332ef50 100644
--- a/xmlsecurity/tools/standalone/csfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
@@ -142,7 +142,7 @@ int SAL_CALL main( int argc, char **argv )
Sequence < Reference< XCertificate > > xPersonalCerts =
pSecEnv->getPersonalCertificates() ;
Sequence < Reference< XCertificate > > xCertPath ;
for( int i = 0; i < xPersonalCerts.getLength(); i ++ ) {
- //Print the certificate infomation.
+ //Print the certificate information.
fprintf( stdout, "\nPersonal Certificate Info\n" ) ;
fprintf( stdout, "\tCertificate Issuer[%s]\n", OUStringToOString(
xPersonalCerts[i]->getIssuerName(), RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
fprintf( stdout, "\tCertificate Serial Number[%s]\n",
OUStringToOString( bigIntegerToNumericString(
xPersonalCerts[i]->getSerialNumber() ), RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
index fee8374..81a2d7a 100644
--- a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
@@ -107,7 +107,7 @@ int SAL_CALL main( int argc, char **argv )
Sequence < Reference< XCertificate > > xCertPath ;
for( int i = 0; i < xPersonalCerts.getLength(); i ++ ) {
- //Print the certificate infomation.
+ //Print the certificate information.
fprintf( stdout, "\nPersonal Certificate Info\n" ) ;
fprintf( stdout, "\tCertificate Issuer[%s]\n", OUStringToOString(
xPersonalCerts[i]->getIssuerName(), RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
fprintf( stdout, "\tCertificate Serial Number[%s]\n",
OUStringToOString( bigIntegerToNumericString(
xPersonalCerts[i]->getSerialNumber() ), RTL_TEXTENCODING_ASCII_US ).getStr() ) ;
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
