Merge branch 'master' into powerpencil

3 files changed, 3 insertions, 3 deletions

diff --git a/share/extensions/test/color_randomize.test.py b/share/extensions/test/color_randomize.test.py
index d8549a35a..2887b96aa 100755
--- a/share/extensions/test/color_randomize.test.py
+++ b/share/extensions/test/color_randomize.test.py
@@ -52,7 +52,7 @@ class ColorRandomizeColorModificationTest(unittest.TestCase):
         hsl = extract_hsl(self.e, self.e.colmod(150, 100, 200))
         self.assertEqual([0.47, 0.59], [round(hsl[1], 2), round(hsl[2], 2)])
 
-    @unittest.skip("Inaccurate convertion")
+    @unittest.skip("Inaccurate conversion")
     def test_random_lightness(self):
         """ Random lightness only. Hue and saturation not changed. """
         args = ['-y 0', '-t 0', '-m 50', 'svg/empty-SVG.svg']
diff --git a/share/extensions/test/gimp_xcf.test.py b/share/extensions/test/gimp_xcf.test.py
index b5a530a49..de2498ec8 100755
--- a/share/extensions/test/gimp_xcf.test.py
+++ b/share/extensions/test/gimp_xcf.test.py
@@ -38,7 +38,7 @@ class GimpXCFBasicTest(unittest.TestCase):
         self.assertEqual(e.valid, 0)
 
     def test_empty_layer_file(self):
-        # default-inkscape-SVG.svg is a copy of the defaut Inkscape
+        # default-inkscape-SVG.svg is a copy of the default Inkscape
         # template, with one empty layer.
         # The file must have at least one non empty layer and thus the
         # extension rejects it and send an error message.
diff --git a/share/extensions/test/inkweb-debug.js b/share/extensions/test/inkweb-debug.js
index a4035503a..3fd24e3c2 100644
--- a/share/extensions/test/inkweb-debug.js
+++ b/share/extensions/test/inkweb-debug.js
@@ -252,7 +252,7 @@ InkWeb.__logSequence = function ( msg ) {
 }
 
 InkWeb.logToString = function (conf) {
-  /* Show the log in a formated string.
+  /* Show the log in a formatted string.
   ** conf attributes:
   **   format: a string to format the log itens.
   **   formatError: to format the error log itens.