Merge lp:~johnsmith1234/ubuntu/oneiric/inkscape/fix-for-807861 into lp:ubuntu/oneiric/inkscape

[John smith]

[Jamie Strandboge (jdstrand)]

Thank you for submitting this to improve Ubuntu. Unfortunately, Ubuntu 11.10 has been released and this change is not appropriate for a stable release update (SRU). Based on the bug, it looks like this may be getting fixed upstream. I am going to mark this merge as 'Disapprove' for now. Please feel free to comment in the bug.

review: Disapprove

Unmerged revisions

60. By John smith on 2012-06-08

Spelling mistakes updated (LP: #807861)

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-10 11:35:30 +0000
+++ debian/changelog	2012-06-08 15:00:32 +0000
@@ -1,3 +1,9 @@
+inkscape (0.48.2-0ubuntu2) oneiric; urgency=low
+
+  * Spelling mistakes updated (LP: #807861) 
+
+ -- Matthew Mollett <[e-mail]>  Fri, 08 Jun 2012 15:45:31 +0100
+
 inkscape (0.48.2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release (LP: #807912).  Fixes several Ubuntu bugs:

=== modified file 'share/extensions/webslicer_create_group.py'
--- share/extensions/webslicer_create_group.py	2010-09-12 19:44:58 +0000
+++ share/extensions/webslicer_create_group.py	2012-06-08 15:00:32 +0000
@@ -71,7 +71,7 @@
             exit(1)
         for id,node in self.selected.iteritems():
             if node not in self.layer_descendants:
-                inkex.errormsg(_('Opss... The element "%s" is not in the Web Slicer layer') % id)
+                inkex.errormsg(_('Oops... The element "%s" is not in the Web Slicer layer') % id)
                 exit(2)
         g_parent = self.getParentNode(node)
         group = inkex.etree.SubElement(g_parent, 'g')

=== modified file 'src/widgets/toolbox.cpp'
--- src/widgets/toolbox.cpp	2011-07-10 11:35:30 +0000
+++ src/widgets/toolbox.cpp	2012-06-08 15:00:32 +0000
@@ -4682,7 +4682,7 @@
         gdouble values[] = {10, 25, 35, 50, 60, 80, 100};
         EgeAdjustmentAction *eact = create_adjustment_action( "SprayPopulationAction",
                                                               _("Amount"), _("Amount:"),
-                                                              _("Adjusts the number of items sprayed per clic."),
+                                                              _("Adjusts the number of items sprayed per click."),
                                                               "/tools/spray/population", 70,
                                                               GTK_WIDGET(desktop->canvas), NULL, holder, TRUE, "spray-population",
                                                               1, 100, 1.0, 10.0,