diff options
| author | Yuri Chornoivan <> | 2015-03-08 16:10:20 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2015-03-08 16:10:20 +0000 |
| commit | e7aeaa6686b087d1226f08936971371cd640e089 (patch) | |
| tree | bae80b636d31f53943a4e4ae73ba5abfdfbe944b | |
| parent | extensions. convert2dashes. support offset parameter. (Bug 1426889) (diff) | |
| download | inkscape-e7aeaa6686b087d1226f08936971371cd640e089.tar.gz inkscape-e7aeaa6686b087d1226f08936971371cd640e089.zip | |
i10n. Fix for Bug #1429579 (Various typos in the trunk code).
Fixed bugs:
- https://launchpad.net/bugs/1429579
(bzr r13976)
| -rw-r--r-- | cxxtest/docs/guide.html | 2 | ||||
| -rw-r--r-- | doc/extension_system.txt | 2 | ||||
| -rw-r--r-- | doc/extension_system.xml | 2 | ||||
| -rw-r--r-- | po/inkscape.pot | 48 | ||||
| -rwxr-xr-x | share/extensions/funcplot.py | 2 | ||||
| -rwxr-xr-x | share/extensions/pathalongpath.py | 4 | ||||
| -rwxr-xr-x | share/extensions/pathscatter.py | 6 | ||||
| -rw-r--r-- | src/libcroco/cr-statement.c | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-knot.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-simplify.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-sketch.cpp | 2 |
11 files changed, 41 insertions, 33 deletions
diff --git a/cxxtest/docs/guide.html b/cxxtest/docs/guide.html index fb435fb8f..01391ddea 100644 --- a/cxxtest/docs/guide.html +++ b/cxxtest/docs/guide.html @@ -179,7 +179,7 @@ where to find X, usually something like <code>g++ -o runner <li>If you have <a href="http://www.trolltech.com">Qt</a> installed, try running <code>cxxtestgen.pl</code> with the option <code>--gui=QtGui</code>. As -always, compile and link the the Qt headers and libraries. +always, compile and link the Qt headers and libraries. </ul> diff --git a/doc/extension_system.txt b/doc/extension_system.txt index 39ab9b37d..e1918701c 100644 --- a/doc/extension_system.txt +++ b/doc/extension_system.txt @@ -43,7 +43,7 @@ modified. Please look aton the Inkscape webpage also. libraries should not be loaded until they are used. *Script* - A script is a type of extension that is implemented through - an external program that recieves and sets SVG data through files and + an external program that receives and sets SVG data through files and pipes. This allows Inkscape to use programs that handle SVG but are targeted differently, seemlessly inside of Inkscape. diff --git a/doc/extension_system.xml b/doc/extension_system.xml index 1e59eda91..e4271362a 100644 --- a/doc/extension_system.xml +++ b/doc/extension_system.xml @@ -14,7 +14,7 @@ <para><emphasis>Extension Type</emphasis> - Establishes the functional interface that the Extension provides, including the types of messages it handles and what is contained in its data structures.</para> <para><emphasis>Extension Implementation</emphasis> - Defines how the extension is accessed; i.e. through message passing, pipe/exec calls with commandline arguments, direct function calls, etc.</para> <para><emphasis>Plug-in</emphasis> - An extension that is implemented through a loadable library. This is a .so file on Unix-like systems or a .dll on Win32. The libraries should not be loaded until they are used.</para> - <para><emphasis>Script</emphasis> - A script is a type of extension that is implemented through an external program that recieves and sets SVG data through files and pipes. This allows Inkscape to use programs that handle SVG but are targeted differently, seemlessly inside of Inkscape.</para> + <para><emphasis>Script</emphasis> - A script is a type of extension that is implemented through an external program that receives and sets SVG data through files and pipes. This allows Inkscape to use programs that handle SVG but are targeted differently, seemlessly inside of Inkscape.</para> <para><emphasis>Language Binding</emphasis> - A special type of plug-in that wraps a scripting language interpreter such as Perl, Python, Lisp, etc. A user interested in programmatic access to Inkscape's internals via one of these languages can install (or create) the relevant Language Binding Plug-in to achieve this.</para> <para><emphasis>INX</emphasis> - <emphasis>'INkscape eXtension'</emphasis> - The filename extension used for XML metadata files that describe each Inkscape Extension.</para> <para><emphasis>Internal Extension</emphasis> - A part of the Inkscape codebase which uses the extension system in order to make it more modular. This code is compiled into Inkscape, but appears as an extension to all other code in the codebase.</para> diff --git a/po/inkscape.pot b/po/inkscape.pot index c8d8b2266..44e793e50 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-03-06 09:42+0100\n" +"POT-Creation-Date: 2015-03-08 17:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -9368,11 +9368,11 @@ msgstr "" msgid "Change weight of the effect" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:291 +#: ../src/live_effects/lpe-bspline.cpp:305 msgid "Default weight" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:296 +#: ../src/live_effects/lpe-bspline.cpp:310 msgid "Make cusp" msgstr "" @@ -10694,55 +10694,63 @@ msgid "" "you are applying it to. If this is not what you want, click Cancel." msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:29 +#: ../src/live_effects/lpe-simplify.cpp:30 msgid "Steps:" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:29 +#: ../src/live_effects/lpe-simplify.cpp:30 msgid "Change number of simplify steps " msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:30 +#: ../src/live_effects/lpe-simplify.cpp:31 msgid "Roughly threshold:" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:31 -msgid "Helper size:" +#: ../src/live_effects/lpe-simplify.cpp:32 +msgid "Smooth angles:" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:31 -msgid "Helper size" +#: ../src/live_effects/lpe-simplify.cpp:32 +msgid "Max degree difference on handles to preform a smooth" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:32 +#: ../src/live_effects/lpe-simplify.cpp:33 +msgid "Helper" +msgstr "" + +#: ../src/live_effects/lpe-simplify.cpp:33 +msgid "Show helper" +msgstr "" + +#: ../src/live_effects/lpe-simplify.cpp:35 msgid "Helper nodes" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:32 +#: ../src/live_effects/lpe-simplify.cpp:35 msgid "Show helper nodes" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:34 +#: ../src/live_effects/lpe-simplify.cpp:37 msgid "Helper handles" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:34 +#: ../src/live_effects/lpe-simplify.cpp:37 msgid "Show helper handles" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:36 +#: ../src/live_effects/lpe-simplify.cpp:39 msgid "Paths separately" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:36 +#: ../src/live_effects/lpe-simplify.cpp:39 msgid "Simplifying paths (separately)" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:38 +#: ../src/live_effects/lpe-simplify.cpp:41 msgid "Just coalesce" msgstr "" -#: ../src/live_effects/lpe-simplify.cpp:38 +#: ../src/live_effects/lpe-simplify.cpp:41 msgid "Simplify just coalesce" msgstr "" @@ -29055,7 +29063,7 @@ msgstr "" msgid "Use the pressure of the input device to alter the force of tweak action" msgstr "" -#: ../share/extensions/convert2dashes.py:93 +#: ../share/extensions/convert2dashes.py:100 msgid "" "The selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -29165,7 +29173,7 @@ msgstr "" #: ../share/extensions/funcplot.py:48 msgid "" -"x-interval cannot be zero. Please modify 'Start X value' or 'End X alue'" +"x-interval cannot be zero. Please modify 'Start X value' or 'End X value'" msgstr "" #: ../share/extensions/funcplot.py:60 diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py index 606fb0c28..f37bf335e 100755 --- a/share/extensions/funcplot.py +++ b/share/extensions/funcplot.py @@ -45,7 +45,7 @@ def drawfunction(xstart, xend, ybottom, ytop, samples, width, height, left, bott # coords and scales based on the source rect if xstart == xend: - inkex.errormsg(_("x-interval cannot be zero. Please modify 'Start X value' or 'End X alue'")) + inkex.errormsg(_("x-interval cannot be zero. Please modify 'Start X value' or 'End X value'")) return [] scalex = width / (xend - xstart) xoff = left diff --git a/share/extensions/pathalongpath.py b/share/extensions/pathalongpath.py index 7da7f1797..234430acd 100755 --- a/share/extensions/pathalongpath.py +++ b/share/extensions/pathalongpath.py @@ -66,7 +66,7 @@ def stretch(pathcomp,xscale,yscale,org): def linearize(p,tolerance=0.001): ''' - This function recieves a component of a 'cubicsuperpath' and returns two things: + This function receives a component of a 'cubicsuperpath' and returns two things: The path subdivided in many straight segments, and an array containing the length of each segment. We could work with bezier path as well, but bezier arc lengths are (re)computed for each point @@ -153,7 +153,7 @@ class PathAlongPath(pathmodifier.Diffeo): def lengthtotime(self,l): ''' Recieves an arc length l, and returns the index of the segment in self.skelcomp - containing the coresponding point, to gether with the position of the point on this segment. + containing the corresponding point, to gether with the position of the point on this segment. If the deformer is closed, do computations modulo the toal length. ''' diff --git a/share/extensions/pathscatter.py b/share/extensions/pathscatter.py index 268e31069..5c2857979 100755 --- a/share/extensions/pathscatter.py +++ b/share/extensions/pathscatter.py @@ -80,7 +80,7 @@ def stretch(pathcomp,xscale,yscale,org): def linearize(p,tolerance=0.001): ''' - This function recieves a component of a 'cubicsuperpath' and returns two things: + This function receives a component of a 'cubicsuperpath' and returns two things: The path subdivided in many straight segments, and an array containing the length of each segment. We could work with bezier path as well, but bezier arc lengths are (re)computed for each point @@ -186,7 +186,7 @@ class PathScatter(pathmodifier.Diffeo): def lengthtotime(self,l): ''' Recieves an arc length l, and returns the index of the segment in self.skelcomp - containing the coresponding point, to gether with the position of the point on this segment. + containing the corresponding point, to gether with the position of the point on this segment. If the deformer is closed, do computations modulo the toal length. ''' @@ -203,7 +203,7 @@ class PathScatter(pathmodifier.Diffeo): def localTransformAt(self,s,follow=True): ''' - recieves a length, and returns the coresponding point and tangent of self.skelcomp + receives a length, and returns the coresponding point and tangent of self.skelcomp if follow is set to false, returns only the translation ''' i,t=self.lengthtotime(s) diff --git a/src/libcroco/cr-statement.c b/src/libcroco/cr-statement.c index fb8df867f..4666f26ec 100644 --- a/src/libcroco/cr-statement.c +++ b/src/libcroco/cr-statement.c @@ -2011,7 +2011,7 @@ cr_statement_ruleset_set_sel_list (CRStatement * a_this, * cr_statement_ruleset_get_declarations: * *@a_this: the current instance of #CRStatement. - *@a_decl_list: out parameter. A pointer to the the returned + *@a_decl_list: out parameter. A pointer to the returned *list of declaration. Must not be NULL. * *Gets a pointer to the list of declaration contained diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp index 3876aa24b..820221abf 100644 --- a/src/live_effects/lpe-knot.cpp +++ b/src/live_effects/lpe-knot.cpp @@ -404,7 +404,7 @@ LPEKnot::doEffect_path (std::vector<Geom::Path> const &path_in) for (unsigned comp=0; comp<path_in.size(); comp++){ //find the relevant path component in gpaths (required to allow groups!) - //Q: do we always recieve the group members in the same order? can we rest on that? + //Q: do we always receive the group members in the same order? can we rest on that? unsigned i0 = 0; for (i0=0; i0<gpaths.size(); i0++){ if (path_in[comp]==gpaths[i0]) break; diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index 12bd9dc60..99439f5ab 100644 --- a/src/live_effects/lpe-simplify.cpp +++ b/src/live_effects/lpe-simplify.cpp @@ -29,7 +29,7 @@ LPESimplify::LPESimplify(LivePathEffectObject *lpeobject) : Effect(lpeobject), steps(_("Steps:"),_("Change number of simplify steps "), "steps", &wr, this,1), threshold(_("Roughly threshold:"), _("Roughly threshold:"), "threshold", &wr, this, 0.003), - smooth_angles(_("Smooth angles:"), _("Max degree diference on handles to preform a smooth"), "smooth_angles", &wr, this, 20.), + smooth_angles(_("Smooth angles:"), _("Max degree difference on handles to preform a smooth"), "smooth_angles", &wr, this, 20.), helper(_("Helper"), _("Show helper"), "helper", &wr, this, false, "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), nodes(_("Helper nodes"), _("Show helper nodes"), "nodes", &wr, this, false, diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp index 8ad0e616f..551dbe16a 100644 --- a/src/live_effects/lpe-sketch.cpp +++ b/src/live_effects/lpe-sketch.cpp @@ -240,7 +240,7 @@ LPESketch::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_ for (unsigned i = 0; i<nbiter_approxstrokes; i++){ //Basic steps: - //- Choose a rdm seg [s0,s1], find coresponding [t0,t1], + //- Choose a rdm seg [s0,s1], find corresponding [t0,t1], //- Pick a rdm perturbation delta(s), collect 'piece(t)+delta(s(t))' over [t0,t1] into output. // pick a point where to start the stroke (s0 = dist from start). |
