From a48fffd9a34231addef70769fbddcd21157a401f Mon Sep 17 00:00:00 2001 From: elexis Date: Sat, 28 Oct 2017 22:34:57 +0000 Subject: [PATCH] Fix few typos found with the Debian lintian tool. Differential Revision: https://code.wildfiregames.com/D973 Differential Revision: https://code.wildfiregames.com/D974 Differential Revision: https://code.wildfiregames.com/D975 Patch By: LudovicRousseau Reviewed By: Dunedan, bb git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@20369 3db68df2-c116-0410-a063-a993310a9797 --- source/graphics/ColladaManager.cpp | 6 +++--- source/gui/CGUI.h | 2 +- source/lobby/XmppClient.cpp | 8 ++++---- source/network/NetMessage.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/graphics/ColladaManager.cpp b/source/graphics/ColladaManager.cpp index 8ff6546f82..31d3daa562 100644 --- a/source/graphics/ColladaManager.cpp +++ b/source/graphics/ColladaManager.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2017 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -106,7 +106,7 @@ public: CVFSFile skeletonFile; if (skeletonFile.Load(m_VFS, path) != PSRETURN_OK) { - LOGERROR("Failed to read skeleton defintions from '%s'", path.string8()); + LOGERROR("Failed to read skeleton definitions from '%s'", path.string8()); return ERR::FAIL; } @@ -228,7 +228,7 @@ public: CVFSFile skeletonFile; if (skeletonFile.Load(m_VFS, path) != PSRETURN_OK) { - LOGERROR("Failed to read skeleton defintions from '%s'", path.string8()); + LOGERROR("Failed to read skeleton definitions from '%s'", path.string8()); continue; } diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h index cd4193a9c1..132f35e8f6 100644 --- a/source/gui/CGUI.h +++ b/source/gui/CGUI.h @@ -216,7 +216,7 @@ public: * @param Width Width, 0 if no word-wrapping. * @param BufferZone space between text and edge, and space between text and images. * @param pObject Optional parameter for error output. Used *only* if error parsing fails, - * and we need to be able to output which object the error occured in to aid the user. + * and we need to be able to output which object the error occurred in to aid the user. */ SGUIText GenerateText(const CGUIString& Text, const CStrW& Font, const float& Width, const float& BufferZone, const IGUIObject* pObject = NULL); diff --git a/source/lobby/XmppClient.cpp b/source/lobby/XmppClient.cpp index 92665991e1..a86e84d1de 100644 --- a/source/lobby/XmppClient.cpp +++ b/source/lobby/XmppClient.cpp @@ -1004,7 +1004,7 @@ std::string XmppClient::StanzaErrorToString(gloox::StanzaError err) const switch (err) { CASE(StanzaErrorUndefined, g_L10n.Translate("No error")); - DEBUG_CASE(StanzaErrorBadRequest, "Server recieved malformed XML"); + DEBUG_CASE(StanzaErrorBadRequest, "Server received malformed XML"); CASE(StanzaErrorConflict, g_L10n.Translate("Player already logged in")); DEBUG_CASE(StanzaErrorFeatureNotImplemented, "Server does not implement requested feature"); CASE(StanzaErrorForbidden, g_L10n.Translate("Forbidden")); @@ -1054,8 +1054,8 @@ std::string XmppClient::ConnectionErrorToString(gloox::ConnectionError err) cons DEBUG_CASE(ConnProxyAuthRequired, "The HTTP/SOCKS5 proxy requires authentication"); DEBUG_CASE(ConnProxyAuthFailed, "HTTP/SOCKS5 proxy authentication failed"); DEBUG_CASE(ConnProxyNoSupportedAuth, "The HTTP/SOCKS5 proxy requires an unsupported authentication mechanism"); - CASE(ConnIoError, g_L10n.Translate("An I/O error occured")); - DEBUG_CASE(ConnParseError, "An XML parse error occured"); + CASE(ConnIoError, g_L10n.Translate("An I/O error occurred")); + DEBUG_CASE(ConnParseError, "An XML parse error occurred"); CASE(ConnConnectionRefused, g_L10n.Translate("The connection was refused by the server")); CASE(ConnDnsError, g_L10n.Translate("Resolving the server's hostname failed")); CASE(ConnOutOfMemory, g_L10n.Translate("This system is out of memory")); @@ -1090,7 +1090,7 @@ std::string XmppClient::RegistrationResultToString(gloox::RegistrationResult res CASE(RegistrationNotAcceptable, g_L10n.Translate("Not all necessary information provided")); CASE(RegistrationConflict, g_L10n.Translate("Username already exists")); DEBUG_CASE(RegistrationNotAuthorized, "Account removal timeout or insufficiently secure channel for password change"); - DEBUG_CASE(RegistrationBadRequest, "Server recieved incomplete request"); + DEBUG_CASE(RegistrationBadRequest, "Server received an incomplete request"); DEBUG_CASE(RegistrationForbidden, "Registration forbidden"); DEBUG_CASE(RegistrationRequired, "Account cannot be removed as it does not exist"); DEBUG_CASE(RegistrationUnexpectedRequest, "This client is unregistered with the server"); diff --git a/source/network/NetMessage.h b/source/network/NetMessage.h index b4b174c760..3e975ddc89 100644 --- a/source/network/NetMessage.h +++ b/source/network/NetMessage.h @@ -64,7 +64,7 @@ public: * @param pStart Message start within the serialized buffer * @param pEnd Message end within the serialized buffer * @return The position in the buffer right after the - * message or NULL if an error occured + * message or NULL if an error occurred */ virtual const u8* Deserialize(const u8* pStart, const u8* pEnd); -- 2.11.4.GIT