Index: lib/cppparser/lexercache.h
===================================================================
--- lib/cppparser/lexercache.h
+++ lib/cppparser/lexercache.h
@@ -160,7 +160,7 @@
     //typedef __gnu_cxx::hash_multimap<HashedString, CachedLexedFilePointer> CachedLexedFileMap;
     typedef std::multimap<HashedString, CachedLexedFilePointer> CachedLexedFileMap;
     CachedLexedFileMap m_files;
-    QSet<HashedString> m_totalStringSet; ///This is used to reduce memory-usage: Most strings appear again and again. Because QString is reference-counted, this set contains a unique copy of each string to used for each appearance of the string
+    QSet<HashedString> m_totalStringSet; ///This is used to reduce memory-usage: Most strings appear again and again. Because QString is reference-counted, this set contains a unique copy of each string to use for each appearance of the string
     struct FileModificationCache {
         QDateTime m_readTime;
         QDateTime m_modificationTime;
Index: lib/interfaces/codemodel.h
===================================================================
--- lib/interfaces/codemodel.h
+++ lib/interfaces/codemodel.h
@@ -602,12 +602,12 @@
     {
         return false;
     }
-    /**@return true if an item is a EnumModel.*/
+    /**@return true if an item is an EnumModel.*/
     virtual bool isEnum() const
     {
         return false;
     }
-    /**@return true if an item is a EnumeratorModel.*/
+    /**@return true if an item is an EnumeratorModel.*/
     virtual bool isEnumerator() const
     {
         return false;
Index: lib/kdev4-php/completion/context.h
===================================================================
--- lib/kdev4-php/completion/context.h
+++ lib/kdev4-php/completion/context.h
@@ -149,7 +149,7 @@
     /// relative URLS have to start with a /
     bool m_isFileCompletionAfterDirname;
     /**
-     * a list of indizes of identifiers which must not be added as completion items
+     * a list of indexes of identifiers which must not be added as completion items
      * examples:
      * class test implements foo, ...
      * => identifiers test and foo must not be proposed for completion
Index: lib/kdev4-php/completion/keyworditem.h
===================================================================
--- lib/kdev4-php/completion/keyworditem.h
+++ lib/kdev4-php/completion/keyworditem.h
@@ -33,7 +33,7 @@
 {
 public:
     /// Use @p customReplacement for additional power on how the keyword gets replaced.
-    /// Newlines will be indendet to the indentation level of the line we execute the item on.
+    /// Newlines will be indented to the indentation level of the line we execute the item on.
     /// To increase an indentation level, use %INDENT%. To place the cursor, use %CURSOR%.
     /// Alternatively you can select a word with %SELECT%word%SELECT%
     ///
Index: lib/kdev4-php/completion/tests/bench_completion.cpp
===================================================================
--- lib/kdev4-php/completion/tests/bench_completion.cpp
+++ lib/kdev4-php/completion/tests/bench_completion.cpp
@@ -41,7 +41,7 @@
 
 namespace Php {
 
-// makro defined by cmake, points to the sourcedir of _this_ file
+// macro defined by cmake, points to the sourcedir of _this_ file
 const QString srcPath(KDESRCDIR);
 
 QFile* getFile(const QString& path)
Index: lib/kdev4-php/completion/tests/test_completion.cpp
===================================================================
--- lib/kdev4-php/completion/tests/test_completion.cpp
+++ lib/kdev4-php/completion/tests/test_completion.cpp
@@ -65,7 +65,7 @@
 /**
  * declaration of class A with a number of completion items
  *
- * also introduces a instance of class A named $instA;
+ * also introduces an instance of class A named $instA;
  */
 const QByteArray testClassA(
     "class A {"
@@ -98,7 +98,7 @@
  * declaration of class B which extends class A
  * B has one new public member function
  *
- * also introduces a instance of class B named $instB;
+ * also introduces an instance of class B named $instB;
  */
 const QByteArray testClassB(
     "class B extends A {"
Index: lib/kdev4-php/duchain/builders/declarationbuilder.h
===================================================================
--- lib/kdev4-php/duchain/builders/declarationbuilder.h
+++ lib/kdev4-php/duchain/builders/declarationbuilder.h
@@ -41,7 +41,7 @@
 typedef KDevelop::AbstractDeclarationBuilder<AstNode, IdentifierAst, TypeBuilder> DeclarationBuilderBase;
 
 /**
- * The DeclarationBuilder builds declarations, types and contexts for everything in a AST.
+ * The DeclarationBuilder builds declarations, types and contexts for everything in an AST.
  *
  * \note Since PHP allows the usage of functions, classes and interfaces before definition,
  *       a \see PreDeclarationBuilder is used to get the declarations _and_ types for those.
@@ -158,7 +158,7 @@
     bool isGlobalRedeclaration(const KDevelop::QualifiedIdentifier &identifier, AstNode *node,
                                DeclarationType type);
     /// check if a non-abstract method declaration tries to overwrite a final base method
-    /// or whether a abstract method is redeclared
+    /// or whether an abstract method is redeclared
     /// @param identifier   The identifier for the current method
     /// @param curClass     the current class we are in
     /// @param node         the node we are processing, used to access modifiers and for error reporting
Index: lib/kdev4-php/duchain/tests/benchmarks.cpp
===================================================================
--- lib/kdev4-php/duchain/tests/benchmarks.cpp
+++ lib/kdev4-php/duchain/tests/benchmarks.cpp
@@ -38,7 +38,7 @@
 namespace Php
 {
 
-// makro defined by cmake, points to the sourcedir of _this_ file
+// macro defined by cmake, points to the sourcedir of _this_ file
 const QString srcPath(KDESRCDIR);
 
 Benchmarks::Benchmarks()
Index: lib/kdev4-php/duchain/tests/expressionparser.cpp
===================================================================
--- lib/kdev4-php/duchain/tests/expressionparser.cpp
+++ lib/kdev4-php/duchain/tests/expressionparser.cpp
@@ -546,7 +546,7 @@
     Declaration* decl = top->localDeclarations().last();
     IntegralType::Ptr type = decl->abstractType().cast<IntegralType>();
     QVERIFY(type);
-    QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns a int...", Continue);
+    QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns an int...", Continue);
     QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeInt));
     // fallback
     QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeMixed));
@@ -574,7 +574,7 @@
     Declaration* decl = top->localDeclarations().last();
     IntegralType::Ptr type = decl->abstractType().cast<IntegralType>();
     QVERIFY(type);
-    QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns a int...", Continue);
+    QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns an int...", Continue);
     QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeInt));
     // fallback
     QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeMixed));
Index: lib/kdev5-php/completion/context.h
===================================================================
--- lib/kdev5-php/completion/context.h
+++ lib/kdev5-php/completion/context.h
@@ -146,7 +146,7 @@
     /// relative URLS have to start with a /
     bool m_isFileCompletionAfterDirname;
     /**
-     * a list of indizes of identifiers which must not be added as completion items
+     * a list of indexes of identifiers which must not be added as completion items
      * examples:
      * class test implements foo, ...
      * => identifiers test and foo must not be proposed for completion
Index: lib/kdev5-php/completion/tests/test_completion.cpp
===================================================================
--- lib/kdev5-php/completion/tests/test_completion.cpp
+++ lib/kdev5-php/completion/tests/test_completion.cpp
@@ -66,7 +66,7 @@
 /**
  * declaration of class A with a number of completion items
  *
- * also introduces a instance of class A named $instA;
+ * also introduces an instance of class A named $instA;
  */
 const QByteArray testClassA(
     "class A {"
@@ -99,7 +99,7 @@
  * declaration of class B which extends class A
  * B has one new public member function
  *
- * also introduces a instance of class B named $instB;
+ * also introduces an instance of class B named $instB;
  */
 const QByteArray testClassB(
     "class B extends A {"
Index: lib/kdev5-php/duchain/builders/declarationbuilder.h
===================================================================
--- lib/kdev5-php/duchain/builders/declarationbuilder.h
+++ lib/kdev5-php/duchain/builders/declarationbuilder.h
@@ -41,7 +41,7 @@
 typedef KDevelop::AbstractDeclarationBuilder<AstNode, IdentifierAst, TypeBuilder> DeclarationBuilderBase;
 
 /**
- * The DeclarationBuilder builds declarations, types and contexts for everything in a AST.
+ * The DeclarationBuilder builds declarations, types and contexts for everything in an AST.
  *
  * \note Since PHP allows the usage of functions, classes and interfaces before definition,
  *       a \see PreDeclarationBuilder is used to get the declarations _and_ types for those.
@@ -158,7 +158,7 @@
     bool isGlobalRedeclaration(const KDevelop::QualifiedIdentifier &identifier, AstNode *node,
                                DeclarationType type);
     /// check if a non-abstract method declaration tries to overwrite a final base method
-    /// or whether a abstract method is redeclared
+    /// or whether an abstract method is redeclared
     /// @param ids      The identifier for the current method
     /// @param curClass the current class we are in
     /// @param node     the node we are processing, used to access modifiers and for error reporting
Index: lib/kdev5-php/duchain/tests/expressionparser.cpp
===================================================================
--- lib/kdev5-php/duchain/tests/expressionparser.cpp
+++ lib/kdev5-php/duchain/tests/expressionparser.cpp
@@ -552,7 +552,7 @@
     Declaration* decl = top->localDeclarations().last();
     IntegralType::Ptr type = decl->abstractType().cast<IntegralType>();
     QVERIFY(type);
-    QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns a int...", Continue);
+    QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns an int...", Continue);
     QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeInt));
     // fallback
     QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeMixed));
@@ -580,7 +580,7 @@
     Declaration* decl = top->localDeclarations().last();
     IntegralType::Ptr type = decl->abstractType().cast<IntegralType>();
     QVERIFY(type);
-    QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns a int...", Continue);
+    QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns an int...", Continue);
     QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeInt));
     // fallback
     QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeMixed));
Index: umbrello/_unused/pluginloader.h
===================================================================
--- umbrello/_unused/pluginloader.h
+++ umbrello/_unused/pluginloader.h
@@ -68,7 +68,7 @@
     Q_OBJECT
 public:
 
-    /** Destry the plugin loader */
+    /** Destroy the plugin loader */
     ~PluginLoader();
 
 
Index: umbrello/assocrules.cpp
===================================================================
--- umbrello/assocrules.cpp
+++ umbrello/assocrules.cpp
@@ -280,7 +280,7 @@
             int actTypeB = -1;
             if (actB)
                 actTypeB = actB->activityType();
-            // only from a signalwidget a objectnode widget, a normal activity, branch or fork activity, to the end
+            // only from a signalwidget, an objectnode widget, a normal activity, branch or fork activity, to the end
             if ((actTypeB == ActivityWidget::End || actTypeB == ActivityWidget::Final) &&
                 actTypeA != ActivityWidget::Normal &&
                 actTypeA != ActivityWidget::Branch &&
Index: umbrello/basictypes.cpp
===================================================================
--- umbrello/basictypes.cpp
+++ umbrello/basictypes.cpp
@@ -81,7 +81,7 @@
 }
 
 /**
- * Convert a integer item into ModelType representation.
+ * Convert an integer item into ModelType representation.
  * @param item   integer value to convert
  * @return ModelType enum
  */
@@ -145,7 +145,7 @@
 }
 
 /**
- * Convert a integer item into Visibility representation.
+ * Convert an integer item into Visibility representation.
  * @param item   integer value to convert
  * @return Visibility enum
  */
@@ -333,7 +333,7 @@
 }
 
 /**
- * Converts a AssociationType to its string representation.
+ * Converts an AssociationType to its string representation.
  * @return  the string representation of the AssociationType
  */
 QString toStringI18n(Enum item)
@@ -442,7 +442,7 @@
 }
 
 /**
- * Convert a integer item into ProgrammingLanguage representation.
+ * Convert an integer item into ProgrammingLanguage representation.
  * @param item   integer value to convert
  * @return AssociationType enum
  */
@@ -516,7 +516,7 @@
 }
 
 /**
- * Convert a integer item into LayoutType representation.
+ * Convert an integer item into LayoutType representation.
  * @param item   integer value to convert
  * @return LayoutType enum
  */
@@ -567,7 +567,7 @@
 }
 
 /**
- * Convert a integer item into SignatureType representation.
+ * Convert an integer item into SignatureType representation.
  * @param item   integer value to convert
  * @return SignatureType enum
  */
@@ -655,7 +655,7 @@
 }
 
 /**
- * Convert a integer item into TextRole representation.
+ * Convert an integer item into TextRole representation.
  * @param item   integer value to convert
  * @return TextRole enum
  */
@@ -704,7 +704,7 @@
 }
 
 /**
- * Convert a integer item into Changeability representation.
+ * Convert an integer item into Changeability representation.
  * @param item   integer value to convert
  * @return Changeability enum
  */
@@ -760,7 +760,7 @@
 }
 
 /**
- * Convert a integer item into SequenceMessage representation.
+ * Convert an integer item into SequenceMessage representation.
  * @param item   integer value to convert
  * @return SequenceMessage enum
  */
@@ -804,7 +804,7 @@
 }
 
 /**
- * Convert a integer item into RoleType representation.
+ * Convert an integer item into RoleType representation.
  * @param item   integer value to convert
  * @return RoleType enum
  */
@@ -852,7 +852,7 @@
 }
 
 /**
- * Convert a integer item into ParameterDirection representation.
+ * Convert an integer item into ParameterDirection representation.
  * @param item   integer value to convert
  * @return ParameterDirection enum
  */
@@ -968,7 +968,7 @@
 }
 
 /**
- * Convert a integer item into ProgrammingLanguage representation.
+ * Convert an integer item into ProgrammingLanguage representation.
  * @param item   integer value to convert
  * @return ProgrammingLanguage enum
  */
@@ -1156,7 +1156,7 @@
 }
 
 /**
- * Convert a integer item into Region representation.
+ * Convert an integer item into Region representation.
  * @param item   integer value to convert
  * @return Region enum
  */
@@ -1208,7 +1208,7 @@
 }
 
 /**
- * Convert a integer item into Corner representation.
+ * Convert an integer item into Corner representation.
  * @param item   integer value to convert
  * @return Corner enum
  */
Index: umbrello/clipboard/umlclipboard.cpp
===================================================================
--- umbrello/clipboard/umlclipboard.cpp
+++ umbrello/clipboard/umlclipboard.cpp
@@ -376,7 +376,7 @@
 
 /**
  * Searches the child items of a UMLListViewItem to
- * establish which Copy type is to be perfomed.
+ * establish which Copy type is to be performed.
  * @param item          parent of the children
  * @param withDiagrams  includes diagrams
  * @param withObjects   includes objects
Index: umbrello/codegenerators/as/aswriter.cpp
===================================================================
--- umbrello/codegenerators/as/aswriter.cpp
+++ umbrello/codegenerators/as/aswriter.cpp
@@ -527,7 +527,7 @@
     }
     as << m_endl;
 
-    //Write class Documentation if there is somthing or if force option
+    //Write class Documentation if there is something or if force option
     if (forceDoc() || !c->doc().isEmpty())
     {
         as << m_endl << "/**" << m_endl;
Index: umbrello/codegenerators/codeaccessormethod.h
===================================================================
--- umbrello/codegenerators/codeaccessormethod.h
+++ umbrello/codegenerators/codeaccessormethod.h
@@ -24,11 +24,11 @@
 public:
 
     // some types of accessor methods that are possible:
-    // "GET" is to retrieve single-valued (primative or Object) fields
-    // "SET" is to set single-valued (primative or Object) fields
-    // "ADD" is to add a value to a multiple-valued field of either primative or Object items
-    // "REMOVE" is to remove a value to a multiple-valued field of either primative or Object items
-    // "LIST" is to retrive the entire list of items in a  multiple-valued field
+    // "GET" is to retrieve single-valued (primitive or Object) fields
+    // "SET" is to set single-valued (primitive or Object) fields
+    // "ADD" is to add a value to a multiple-valued field of either primitive or Object items
+    // "REMOVE" is to remove a value to a multiple-valued field of either primitive or Object items
+    // "LIST" is to retrieve the entire list of items in a  multiple-valued field
     enum AccessorType {GET=0, SET, ADD, REMOVE, LIST};
 
     explicit CodeAccessorMethod(CodeClassField * field);
Index: umbrello/codegenerators/cpp/cppheadercodedocument.cpp
===================================================================
--- umbrello/codegenerators/cpp/cppheadercodedocument.cpp
+++ umbrello/codegenerators/cpp/cppheadercodedocument.cpp
@@ -269,7 +269,7 @@
 
 /**
  * Add a code operation to this cpp classifier code document.
- * In the vannilla version, we just tack all operations on the end
+ * In the vanilla version, we just tack all operations on the end
  * of the document.
  * @param op   the code operation
  * @return bool which is true IF the code operation was added successfully
@@ -330,7 +330,7 @@
 // based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
-// such, we will want to insert everything we resonablely will want
+// such, we will want to insert everything we reasonably will want
 // during creation. We can set various parts of the document (esp. the
 // comments) to appear or not, as needed.
 void CPPHeaderCodeDocument::updateContent()
Index: umbrello/codegenerators/cpp/cppsourcecodedocument.h
===================================================================
--- umbrello/codegenerators/cpp/cppsourcecodedocument.h
+++ umbrello/codegenerators/cpp/cppsourcecodedocument.h
@@ -36,7 +36,7 @@
 
     /**
      * Add a code operation to this cpp classifier code document.
-     * In the vannilla version, we just tack all operations on the end
+     * In the vanilla version, we just tack all operations on the end
      * of the document.
      * @param op   the code operation
      * @return     bool which is true IF the code operation was added successfully
Index: umbrello/codegenerators/cpp/cppwriter.cpp
===================================================================
--- umbrello/codegenerators/cpp/cppwriter.cpp
+++ umbrello/codegenerators/cpp/cppwriter.cpp
@@ -45,7 +45,7 @@
   : m_stringIncludeRequired(false)
 {
     // Probably we could resolve this better through the use of templates,
-    // but it is a quick n dirty fix for the timebeing.. until codegeneration
+    // but it is a quick n dirty fix for the time being.. until codegeneration
     // template system is in place.
     // You can insert code here. 3 general variables exist: "%VARNAME%"
     // allows you to specify where the vector variable should be in your code,
@@ -390,7 +390,7 @@
     if (!c->package().isEmpty() && policyExt()->getPackageIsNamespace())
         cpp << m_endl << "namespace " << cleanName(c->package()) << " {" << m_endl << m_endl;
 
-    //Write class Documentation if there is somthing or if force option
+    //Write class Documentation if there is something or if force option
     if (forceDoc() || !c->doc().isEmpty()) {
         cpp << m_endl << "/**" << m_endl;
         cpp << "  * class " << className_ << m_endl;
@@ -1315,7 +1315,7 @@
 }
 
 /**
- * Intellegently print out header include/forward decl. for associated classes.
+ * Intelligently print out header include/forward decl. for associated classes.
  * Note:
  *   To prevent circular including when both classifiers on either end
  *   of an association have roles we need to have forward declaration of
Index: umbrello/codegenerators/csharp/csharpwriter.cpp
===================================================================
--- umbrello/codegenerators/csharp/csharpwriter.cpp
+++ umbrello/codegenerators/csharp/csharpwriter.cpp
@@ -220,7 +220,7 @@
         m_seenIncludes.append(container);
     }
 
-    //Write class Documentation if there is somthing or if force option
+    //Write class Documentation if there is something or if force option
     if (forceDoc() || !c->doc().isEmpty()) {
         cs << m_container_indent << "/// <summary>" << m_endl;
         cs << formatDoc(c->doc(), m_container_indent + QLatin1String("/// "));
Index: umbrello/codegenerators/d/dclassifiercodedocument.cpp
===================================================================
--- umbrello/codegenerators/d/dclassifiercodedocument.cpp
+++ umbrello/codegenerators/d/dclassifiercodedocument.cpp
@@ -108,7 +108,7 @@
 
 /**
  * Add a code operation to this d classifier code document.
- * In the vannilla version, we just tack all operations on the end
+ * In the vanilla version, we just tack all operations on the end
  * of the document.
  * @param op   the code operation
  * @return bool which is true IF the code operation was added successfully
@@ -273,7 +273,7 @@
 // based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
-// such, we will want to insert everything we resonablely will want
+// such, we will want to insert everything we reasonably will want
 // during creation. We can set various parts of the document (esp. the
 // comments) to appear or not, as needed.
 void DClassifierCodeDocument::updateContent()
Index: umbrello/codegenerators/d/dcodegenerator.cpp
===================================================================
--- umbrello/codegenerators/d/dcodegenerator.cpp
+++ umbrello/codegenerators/d/dcodegenerator.cpp
@@ -114,7 +114,7 @@
 
 /**
  * IF the type is "string" we need to declare it as
- * the D Object "String" (there is no string primative in D).
+ * the D Object "String" (there is no string primitive in D).
  * Same thing again for "bool" to "boolean".
  * @param item   the item to change
  * @return the changed item
Index: umbrello/codegenerators/d/dwriter.cpp
===================================================================
--- umbrello/codegenerators/d/dwriter.cpp
+++ umbrello/codegenerators/d/dwriter.cpp
@@ -142,7 +142,7 @@
     writeModuleImports(c, d);
 
     // write the opening declaration for the class incl any documentation,
-    // interfaces and/or inheritence issues we have
+    // interfaces and/or inheritance issues we have
     writeClassDecl(c, d);
 
     // start body of class
@@ -707,7 +707,7 @@
 }
 
 // IF the type is "string" we need to declare it as
-// the D Object "String" (there is no string primative in D).
+// the D Object "String" (there is no string primitive in D).
 // Same thing again for "bool" to "boolean"
 QString DWriter::fixTypeName(const QString& string)
 {
Index: umbrello/codegenerators/java/javaclassifiercodedocument.cpp
===================================================================
--- umbrello/codegenerators/java/javaclassifiercodedocument.cpp
+++ umbrello/codegenerators/java/javaclassifiercodedocument.cpp
@@ -110,7 +110,7 @@
 /**
  * @param       op
  */
-// in the vannilla version, we just tack all operations on the end
+// in the vanilla version, we just tack all operations on the end
 // of the document
 bool JavaClassifierCodeDocument::addCodeOperation (CodeOperation * op)
 {
@@ -264,7 +264,7 @@
 // based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
-// such, we will want to insert everything we resonablely will want
+// such, we will want to insert everything we reasonably will want
 // during creation. We can set various parts of the document (esp. the
 // comments) to appear or not, as needed.
 void JavaClassifierCodeDocument::updateContent()
Index: umbrello/codegenerators/java/javacodegenerator.cpp
===================================================================
--- umbrello/codegenerators/java/javacodegenerator.cpp
+++ umbrello/codegenerators/java/javacodegenerator.cpp
@@ -286,7 +286,7 @@
 
 /**
  * IF the type is "string" we need to declare it as
- * the Java Object "String" (there is no string primative in Java).
+ * the Java Object "String" (there is no string primitive in Java).
  * Same thing again for "bool" to "boolean".
  */
 QString JavaCodeGenerator::fixTypeName(const QString &string)
Index: umbrello/codegenerators/java/javawriter.cpp
===================================================================
--- umbrello/codegenerators/java/javawriter.cpp
+++ umbrello/codegenerators/java/javawriter.cpp
@@ -174,7 +174,7 @@
     writeBlankLine(java);
 
     // write the opening declaration for the class incl any documentation,
-    // interfaces and/or inheritence issues we have
+    // interfaces and/or inheritance issues we have
     writeClassDecl(c, java);
 
     // start body of class
@@ -333,7 +333,7 @@
         }
         else
         {
-            //The java generated code is wrong ! : No multiple inheritence of class
+            //The java generated code is wrong ! : No multiple inheritance of class
             java <<  ", " ;
         }
         java <<  cleanName(concept->name());
@@ -352,7 +352,7 @@
         }
         else
         {
-            //The java generated code is OK ! : multiple inheritence of interface
+            //The java generated code is OK ! : multiple inheritance of interface
             java <<  ", " ;
         }
         java <<  cleanName(concept->name());
Index: umbrello/codegenerators/js/jswriter.cpp
===================================================================
--- umbrello/codegenerators/js/jswriter.cpp
+++ umbrello/codegenerators/js/jswriter.cpp
@@ -86,7 +86,7 @@
     }
     js << m_endl;
 
-    //Write class Documentation if there is somthing or if force option
+    //Write class Documentation if there is something or if force option
     if (forceDoc() || !c->doc().isEmpty())
     {
         js << m_endl << "/**" << m_endl;
Index: umbrello/codegenerators/php/php5writer.cpp
===================================================================
--- umbrello/codegenerators/php/php5writer.cpp
+++ umbrello/codegenerators/php/php5writer.cpp
@@ -3041,7 +3041,7 @@
     }
     php << m_endl;
 
-    //Write class Documentation if there is somthing or if force option
+    //Write class Documentation if there is something or if force option
     if (forceDoc() || !c->doc().isEmpty()) {
         php << m_endl << "/**" << m_endl;
         php << " * class " << classname << m_endl;
Index: umbrello/codegenerators/php/phpwriter.cpp
===================================================================
--- umbrello/codegenerators/php/phpwriter.cpp
+++ umbrello/codegenerators/php/phpwriter.cpp
@@ -3036,7 +3036,7 @@
     }
     php << m_endl;
 
-    //Write class Documentation if there is somthing or if force option
+    //Write class Documentation if there is something or if force option
     if (forceDoc() || !c->doc().isEmpty()) {
         php << m_endl << "/**" << m_endl;
         php << " * class " << classname << m_endl;
Index: umbrello/codegenerators/ruby/rubyclassifiercodedocument.cpp
===================================================================
--- umbrello/codegenerators/ruby/rubyclassifiercodedocument.cpp
+++ umbrello/codegenerators/ruby/rubyclassifiercodedocument.cpp
@@ -307,7 +307,7 @@
 // based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
-// such, we will want to insert everything we resonablely will want
+// such, we will want to insert everything we reasonably will want
 // during creation. We can set various parts of the document (esp. the
 // comments) to appear or not, as needed.
 void RubyClassifierCodeDocument::updateContent()
Index: umbrello/codegenerators/sql/sqlwriter.cpp
===================================================================
--- umbrello/codegenerators/sql/sqlwriter.cpp
+++ umbrello/codegenerators/sql/sqlwriter.cpp
@@ -225,7 +225,7 @@
         sql << str << m_endl;
     }
 
-    //Write class Documentation if there is somthing or if force option
+    //Write class Documentation if there is something or if force option
     if (forceDoc() || !m_pEntity->doc().isEmpty()) {
         sql << m_endl << "--" << m_endl;
         sql << "-- TABLE: " << entityname << m_endl;
Index: umbrello/codegenerators/textblock.h
===================================================================
--- umbrello/codegenerators/textblock.h
+++ umbrello/codegenerators/textblock.h
@@ -19,7 +19,7 @@
 class CodeDocument;
 
 /**
- * The fundemental unit of text within an output file containing code.
+ * The fundamental unit of text within an output file containing code.
  */
 class TextBlock
 {
Index: umbrello/codegenerators/vala/valawriter.cpp
===================================================================
--- umbrello/codegenerators/vala/valawriter.cpp
+++ umbrello/codegenerators/vala/valawriter.cpp
@@ -258,7 +258,7 @@
         m_seenIncludes.append(container);
     }
 
-    //Write class Documentation if there is somthing or if force option
+    //Write class Documentation if there is something or if force option
     if (forceDoc() || !c->doc().isEmpty()) {
         cs << m_container_indent << "/**" << m_endl;
         if (c->doc().isEmpty()) {
Index: umbrello/codegenerators/xml/xmlschemawriter.h
===================================================================
--- umbrello/codegenerators/xml/xmlschemawriter.h
+++ umbrello/codegenerators/xml/xmlschemawriter.h
@@ -30,7 +30,7 @@
   * Our basic approach is to map UMLClassifiers (classes/interfaces) into
   * XML elements (or nodes). We declare these element in the schema either
   * as complexType or as groups based on whether they are concrete or abstract
-  * in nature. This is not a perfect decision, but thats life with XML Schema...
+  * in nature. This is not a perfect decision, but that's life with XML Schema...
   * you cant fully represent Objects in the XML world ..yet. -b.t.
   */
 
Index: umbrello/codegenerators/xml/xmlschemawriter.cpp
===================================================================
--- umbrello/codegenerators/xml/xmlschemawriter.cpp
+++ umbrello/codegenerators/xml/xmlschemawriter.cpp
@@ -136,7 +136,7 @@
     // tidy up. no dangling open files please..
     file.close();
 
-    // bookeeping for code generation
+    // bookkeeping for code generation
     emit codeGenerated(c, true);
     emit showGeneratedFile(file.fileName());
 
@@ -319,7 +319,7 @@
             QString superClassName = getElementTypeName(superclasses.first());
             xs << indent() << "<" << makeSchemaTag(QLatin1String("complexContent")) << ">" << m_endl;
 
-            //PROBLEM: we only treat ONE superclass for inheritence.. bah.
+            //PROBLEM: we only treat ONE superclass for inheritance.. bah.
             m_indentLevel++;
             xs << indent() << "<" << makeSchemaTag(QLatin1String("extension")) << " base=\"" << makePackageTag(superClassName)
                <<"\"";
@@ -735,7 +735,7 @@
     //
     // The flipside for concrete classes is that we want to use them as elements in our document.
     // Unfortunately, about all you can do with complexTypes in terms of inheritance, is to
-    // use these as the basis for a new node type. This is NOT full inheritence because the new
+    // use these as the basis for a new node type. This is NOT full inheritance because the new
     // class (err. element node) wont be able to go into the document where it parent went without
     // you heavily editing the schema.
     //
@@ -744,7 +744,7 @@
     // as complexTypes.
     //
     // Of course, in OO methodology, you should be able to inherit from
-    // any class, but schema just don't allow use to have full inheritence using either groups
+    // any class, but schema just don't allow use to have full inheritance using either groups
     // or complexTypes. Thus we have taken a middle rode. If someone wants to key me into a
     // better way to represent this, I'd be happy to listen. =b.t.
     //
@@ -773,7 +773,7 @@
 /**
  * Replaces `string' with `String' and `bool' with `boolean'
  * IF the type is "string" we need to declare it as
- * the XMLSchema Object "String" (there is no string primative in XMLSchema).
+ * the XMLSchema Object "String" (there is no string primitive in XMLSchema).
  * Same thing again for "bool" to "boolean".
  */
 QString XMLSchemaWriter::fixTypeName(const QString& string)
Index: umbrello/codeimport/csharp/csharpimport.cpp
===================================================================
--- umbrello/codeimport/csharp/csharpimport.cpp
+++ umbrello/codeimport/csharp/csharpimport.cpp
@@ -589,7 +589,7 @@
 }
 
 /**
- * Check if keyword is a interface, struct, enum or delegate modifier.
+ * Check if keyword is an interface, struct, enum or delegate modifier.
  * @return   result of check
  */
 bool CSharpImport::isCommonModifier(const QString& keyword)
Index: umbrello/codeimport/import_utils.h
===================================================================
--- umbrello/codeimport/import_utils.h
+++ umbrello/codeimport/import_utils.h
@@ -53,7 +53,7 @@
                                bool searchInParentPackageOnly = false,
                                bool remapParent = true);
 
-    UMLObject* createUMLObjectHierachy(UMLObject::ObjectType type, const QString &name, UMLPackage *parentPkg);
+    UMLObject* createUMLObjectHierarchy(UMLObject::ObjectType type, const QString &name, UMLPackage *parentPkg);
 
     void putAtGlobalScope(bool yesno);
 
Index: umbrello/codeimport/import_utils.cpp
===================================================================
--- umbrello/codeimport/import_utils.cpp
+++ umbrello/codeimport/import_utils.cpp
@@ -365,15 +365,15 @@
 /**
  * Create hierachical tree of UML objects
  *
- * This methods creates the UML object specified by #type and #name including an optional namespace hierachy
+ * This method creates the UML object specified by #type and #name including an optional namespace hierarchy
  * if included in the #name e.g. NamespaceA::ClassA in C++.
  *
  * @param type  type of UML object to create
  * @param name  name of UML object
- * @param topLevelParent  UML package to add the hierachie of UML objects
+ * @param topLevelParent  UML package to add the hierarchy of UML objects
  * @return pointer to created or found UML object
  */
-UMLObject* createUMLObjectHierachy(UMLObject::ObjectType type, const QString &name, UMLPackage *topLevelParent)
+UMLObject* createUMLObjectHierarchy(UMLObject::ObjectType type, const QString &name, UMLPackage *topLevelParent)
 {
     UMLPackage *parent = topLevelParent;
     QString objectName;
Index: umbrello/codeimport/javaimport.cpp
===================================================================
--- umbrello/codeimport/javaimport.cpp
+++ umbrello/codeimport/javaimport.cpp
@@ -205,7 +205,7 @@
     QStringList package = m_currentPackage.split(QLatin1Char('.'));
     int dirsInPackageCount = package.size();
 
-    // in case the path does not fit into the package hierachy 
+    // in case the path does not fit into the package hierarchy 
     // we cannot check the imports 
     if (dirsInPackageCount >= file.size())
         return 0; 
Index: umbrello/diagram_utils.cpp
===================================================================
--- umbrello/diagram_utils.cpp
+++ umbrello/diagram_utils.cpp
@@ -260,7 +260,7 @@
             rightWidget = objectsMap[package];
         } else {
             UMLFolder *logicalView = UMLApp::app()->document()->rootFolder(Uml::ModelType::Logical);
-            UMLObject *right = Import_Utils::createUMLObjectHierachy(UMLObject::ot_Class, package, logicalView);
+            UMLObject *right = Import_Utils::createUMLObjectHierarchy(UMLObject::ot_Class, package, logicalView);
 
             rightWidget = (ObjectWidget *)Widget_Factory::createWidget(scene, right);
             rightWidget->setX(mostRightWidget->x() + mostRightWidget->width() + 10);
Index: umbrello/dialogs/codeeditor.cpp
===================================================================
--- umbrello/dialogs/codeeditor.cpp
+++ umbrello/dialogs/codeeditor.cpp
@@ -1528,7 +1528,7 @@
 {
     Q_UNUSED(startCursorPos);  //:TODO:
     loadFromDocument();
-    // make a minima attempt to leave the cursor (view of the code) where
+    // make a minimal attempt to leave the cursor (view of the code) where
     // we started
 //:TODO:    int new_nrof_para = paragraphs() -1;
 //:TODO:    setCursorPosition((startCursorPos < new_nrof_para ? startCursorPos : 0), 0);  //:TODO: crashes the application
Index: umbrello/docgenerators/xhtmlgenerator.cpp
===================================================================
--- umbrello/docgenerators/xhtmlgenerator.cpp
+++ umbrello/docgenerators/xhtmlgenerator.cpp
@@ -107,7 +107,7 @@
 }
 
 /**
- * This slot is triggerd when the first part, xmi to docbook, is finished
+ * This slot is triggered when the first part, xmi to docbook, is finished
  * @param status   status to continue with converting
  */
 void XhtmlGenerator::slotDocbookToXhtml(bool status)
Index: umbrello/toolbarstatemessages.h
===================================================================
--- umbrello/toolbarstatemessages.h
+++ umbrello/toolbarstatemessages.h
@@ -42,7 +42,7 @@
  * @todo sequence message lines should be handled by object widgets. Right now,
  * they aren't taken into account in testOnWidget and an explicit check is
  * needed. However, if onWidget in object widgets is changed to also check for
- * the line, a way to make them prioritaries over other widgets in testOnWidget
+ * the line, a way to give them priority over other widgets in testOnWidget
  * will be needed. For example, when creating a message clicking on an already
  * created message, the message line must be got instead of the message, even if
  * the message is smaller than the line.
Index: umbrello/uml.cpp
===================================================================
--- umbrello/uml.cpp
+++ umbrello/uml.cpp
@@ -817,7 +817,7 @@
 
 /**
  * Sets up the statusbar for the main window by
- * initialzing a statuslabel.
+ * initializing a statuslabel.
  */
 void UMLApp::initStatusBar()
 {
@@ -1908,7 +1908,7 @@
 {
     //fileSave->setEnabled(modified);
 
-    //if anything else needs to be done on a mofication, put it here
+    //if anything else needs to be done on a modification, put it here
 
     // printing should be possible whenever there is something to print
     if (m_loading == false && modified == true && currentView())  {
Index: umbrello/uml1model/association.cpp
===================================================================
--- umbrello/uml1model/association.cpp
+++ umbrello/uml1model/association.cpp
@@ -368,7 +368,7 @@
         // setting the association type:
         //
         // In the old days, we could just record this on the association,
-        // and be done with it. But thats not how the UML13.dtd does things.
+        // and be done with it. But that's not how the UML13.dtd does things.
         // As a result, we are checking roleA for information about the
         // parent association (!) which by this point in the parse, should
         // be set. However, the information that the roles are allowed to have
Index: umbrello/uml1model/foreignkeyconstraint.cpp
===================================================================
--- umbrello/uml1model/foreignkeyconstraint.cpp
+++ umbrello/uml1model/foreignkeyconstraint.cpp
@@ -59,7 +59,7 @@
      m_UpdateAction = uda_NoAction;
      m_DeleteAction = uda_NoAction;
 
-    // connecte signals and slots
+    // connect signals and slots
      connect(this, SIGNAL(sigReferencedEntityChanged()), this, SLOT(slotReferencedEntityChanged()));
 }
 
@@ -249,7 +249,7 @@
 }
 
 /**
- * Check if a attribute pair already exists
+ * Check if an attribute pair already exists
  * @param pAttr The Attribute of the Parent Entity
  * @param rAttr The Attribute of the Referenced Entity
  * @return true if the attribute pair could be found.
Index: umbrello/umldoc.cpp
===================================================================
--- umbrello/umldoc.cpp
+++ umbrello/umldoc.cpp
@@ -1169,7 +1169,7 @@
 }
 
 /**
- * Adds a UMLObject thats already created but doesn't change
+ * Adds a UMLObject that is already created but doesn't change
  * any ids or signal.  Use AddUMLObjectPaste if pasting.
  *
  * @param object   The object to add.
Index: umbrello/umllistview.cpp
===================================================================
--- umbrello/umllistview.cpp
+++ umbrello/umllistview.cpp
@@ -313,7 +313,7 @@
     if (k == Qt::Key_Delete || k == Qt::Key_Backspace) {
         slotDeleteSelectedItems();
     } else if (k == Qt::Key_F3) {
-        // prelimary support for layout generator
+        // preliminary support for layout generator
         LayoutGenerator r;
         if (!r.generate(UMLApp::app()->currentView()->umlScene()))
             return;
@@ -1261,7 +1261,7 @@
 }
 
 /**
- * This methods looks for a object in a folder an its subfolders recursive.
+ * This method looks for an object in a folder an its subfolders recursive.
  * @param folder   The folder entry of the list view.
  * @param obj      The object to be found in the folder.
  * @return The object if found else a NULL pointer.
Index: umbrello/umlscene.cpp
===================================================================
--- umbrello/umlscene.cpp
+++ umbrello/umlscene.cpp
@@ -192,7 +192,7 @@
                 } else if (w->y() < 3 * h2) { // top
                     w->setY(-h2);
                 } else
-                    uWarning() << "uncatched widget position of" << w->name();
+                    uWarning() << "unhandled widget position of" << w->name();
             }
         }
     }
@@ -2195,7 +2195,7 @@
 }
 
 /**
- * Removes a AssociationWidget from a diagram
+ * Removes an AssociationWidget from a diagram
  * Physically deletes the AssociationWidget passed in.
  *
  * @param pAssoc  Pointer to the AssociationWidget.
Index: umbrello/umlwidgets/activitywidget.cpp
===================================================================
--- umbrello/umlwidgets/activitywidget.cpp
+++ umbrello/umlwidgets/activitywidget.cpp
@@ -31,7 +31,7 @@
 DEBUG_REGISTER_DISABLED(ActivityWidget)
 
 /**
- * Creates a Activity widget.
+ * Creates an Activity widget.
  *
  * @param scene          The parent of the widget.
  * @param activityType   The type of activity.
Index: umbrello/umlwidgets/artifactwidget.h
===================================================================
--- umbrello/umlwidgets/artifactwidget.h
+++ umbrello/umlwidgets/artifactwidget.h
@@ -22,7 +22,7 @@
  * Defines a graphical version of the @ref UMLArtifact.
  * Most of the functionality will come from the @ref UMLWidget class.
  *
- * @short A graphical version of a Artifact.
+ * @short A graphical version of an Artifact.
  * @author Jonathan Riddell
  * @see UMLWidget
  * Bugs and comments to umbrello-devel@kde.org or https://bugs.kde.org
Index: umbrello/umlwidgets/artifactwidget.cpp
===================================================================
--- umbrello/umlwidgets/artifactwidget.cpp
+++ umbrello/umlwidgets/artifactwidget.cpp
@@ -20,7 +20,7 @@
 DEBUG_REGISTER_DISABLED(ArtifactWidget)
 
 /**
- * Constructs a ArtifactWidget.
+ * Constructs an ArtifactWidget.
  *
  * @param scene     The parent of this ArtifactWidget.
  * @param a         The Artifact this widget will be representing.
Index: umbrello/umlwidgets/associationwidget.cpp
===================================================================
--- umbrello/umlwidgets/associationwidget.cpp
+++ umbrello/umlwidgets/associationwidget.cpp
@@ -1235,7 +1235,7 @@
 }
 
 /**
- * CleansUp all the association's data in the related widgets.
+ * Cleans up all the association's data in the related widgets.
  */
 void AssociationWidget::cleanup()
 {
Index: umbrello/umlwidgets/diagramproxywidget.cpp
===================================================================
--- umbrello/umlwidgets/diagramproxywidget.cpp
+++ umbrello/umlwidgets/diagramproxywidget.cpp
@@ -175,7 +175,7 @@
 }
 
 /**
- * Setup synthetizied graphics scene event
+ * Set up synthetic graphics scene event
  *
  * @param e event to setup
  * @param event event source
@@ -195,7 +195,7 @@
 }
 
 /**
- * Setup synthetizied graphics scene context menu event
+ * Set up synthetic graphics scene context menu event
  *
  * @param e event to setup
  * @param event event source
Index: umbrello/umlwidgets/objectnodewidget.cpp
===================================================================
--- umbrello/umlwidgets/objectnodewidget.cpp
+++ umbrello/umlwidgets/objectnodewidget.cpp
@@ -36,7 +36,7 @@
 DEBUG_REGISTER_DISABLED(ObjectNodeWidget)
 
 /**
- * Creates a Object Node widget.
+ * Creates an Object Node widget.
  *
  * @param scene            The parent of the widget.
  * @param objectNodeType   The type of object node
Index: umbrello/umlwidgets/objectwidget.h
===================================================================
--- umbrello/umlwidgets/objectwidget.h
+++ umbrello/umlwidgets/objectwidget.h
@@ -21,7 +21,7 @@
 /**
  * Displays an instance UMLObject of a concept.
  *
- * The local ID is needed as a it can represent a class
+ * The local ID is needed as it can represent a class
  * that has many objects representing it.
  *
  * @short Displays an instance of a Concept.
Index: umbrello/umlwidgets/widget_utils.cpp
===================================================================
--- umbrello/umlwidgets/widget_utils.cpp
+++ umbrello/umlwidgets/widget_utils.cpp
@@ -1013,7 +1013,7 @@
 
     /**
      * Returns translated text string used by widget related dialogs
-     * @param type wodget type
+     * @param type widget type
      * @return translated text string
      */
     QString renameText(WidgetBase::WidgetType type)
Index: umbrello/umlwidgets/widgetbase.cpp
===================================================================
--- umbrello/umlwidgets/widgetbase.cpp
+++ umbrello/umlwidgets/widgetbase.cpp
@@ -511,7 +511,7 @@
 }
 
 /**
- * Returns the font used for diaplaying any text.
+ * Returns the font used for displaying any text.
  * @return the font
  */
 QFont WidgetBase::font() const
Index: unittests/testbase.cpp
===================================================================
--- unittests/testbase.cpp
+++ unittests/testbase.cpp
@@ -80,7 +80,7 @@
 }
 
 /**
- * Return temporay path usable to generated code.
+ * Return temporary path usable to generated code.
  * @return
  */
 QString TestCodeGeneratorBase::temporaryPath()