Merge branch 'luzpaz/inkscape-typos' (!119)

4 files changed, 4 insertions, 4 deletions

diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index ba333d0ed..bd4b21bdb 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -289,7 +289,7 @@ void ColorNotebook::_updateICCButtons()
 
             /* Some literature states that when the sum of paint values exceed 320%, it is considered to be a satured
                color,
-                which means the paper can get too wet due to an excessive ammount of ink. This may lead to several
+                which means the paper can get too wet due to an excessive amount of ink. This may lead to several
                issues
                 such as misalignment and poor quality of printing in general.*/
             if (ink_sum > 3.2)
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index d1755a6d5..f6c81df3b 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -563,7 +563,7 @@ namespace Widget {
           if( (it = table_copy.find("zero")) != table_copy.end() ) table_copy.erase( it );
           std::string ott_list = "OpenType tables not included above: ";
           for(it = table_copy.begin(); it != table_copy.end(); ++it) {
-              // std::cout << "Other: " << it->first << "  Occurances: " << it->second << std::endl;
+              // std::cout << "Other: " << it->first << "  Occurrences: " << it->second << std::endl;
               ott_list += it->first;
               ott_list += ", ";
           }
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index ca33a845c..5f5b801d1 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -67,7 +67,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
 
     show_all_children();
 
-    // These signals dont properly detect change in desktop, rely on owner dialog to call setSubject() from setTargetDesktop()
+    // These signals don't properly detect change in desktop, rely on owner dialog to call setSubject() from setTargetDesktop()
     //_desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_activate), this );
     //_desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "deactivate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_deactivate), this );
 }
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index b5498498d..06b65dfbc 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -104,7 +104,7 @@ public:
     void setDefaultResponse(int response_id);
     void setResponseSensitive(int response_id, bool setting);
 
-    /* Return signals. Signals emited by PanelDialog. */
+    /* Return signals. Signals emitted by PanelDialog. */
     virtual sigc::signal<void, SPDesktop *, SPDocument *> &signalDocumentReplaced();
     virtual sigc::signal<void, SPDesktop *> &signalActivateDesktop();
     virtual sigc::signal<void, SPDesktop *> &signalDeactiveDesktop();